diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ONAP-PAP-REST/pom.xml | 1 | ||||
| -rw-r--r-- | ONAP-PDP-REST/pom.xml | 3 | ||||
| -rw-r--r-- | ONAP-REST/pom.xml | 1 | ||||
| -rw-r--r-- | PolicyEngineAPI/pom.xml | 2 | ||||
| -rw-r--r-- | packages/base/src/files/install/mysql/data/181002_upgrade_script.sql | 2 | ||||
| -rw-r--r-- | pom.xml | 1 |
7 files changed, 4 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 51ab338da..7df831f3b 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ PolicyEngineAPI/logs/ PolicyEngineAPI/POLICY_LOGS_IS_UNDEFINED/ PolicyEngineUtils/logs/ ONAP-REST/logs/common-modules/integrity-monitor/*.log +ONAP-SDK-APP/POLICY_LOGS_IS_UNDEFINED diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 449007bbf..e335128e0 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -298,7 +298,6 @@ </dependency> </dependencies> <properties> - <springframework.version>4.3.15.RELEASE</springframework.version> <hibernate.version>4.3.10.Final</hibernate.version> <projectversion>2.0.2</projectversion> </properties> diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 97df34daa..1aed0700c 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -29,9 +29,6 @@ </parent> <artifactId>ONAP-PDP-REST</artifactId> <description>ONAP PDP REST</description> - <properties> - <springframework.version>4.3.15.RELEASE</springframework.version> - </properties> <packaging>war</packaging> <build> <plugins> diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index be5fe6e5f..924e11662 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -34,7 +34,6 @@ <packaging>jar</packaging> <properties> - <springframework.version>4.3.15.RELEASE</springframework.version> <hibernate.version>4.3.10.Final</hibernate.version> </properties> diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 874409d4a..0311dc267 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>4.3.15.RELEASE</version> + <version>${springframework.version}</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> diff --git a/packages/base/src/files/install/mysql/data/181002_upgrade_script.sql b/packages/base/src/files/install/mysql/data/181002_upgrade_script.sql index 854297dc1..d4d837932 100644 --- a/packages/base/src/files/install/mysql/data/181002_upgrade_script.sql +++ b/packages/base/src/files/install/mysql/data/181002_upgrade_script.sql @@ -70,6 +70,6 @@ update fn_function set type = 'url' , action = '*' where function_cd = 'login'; update fn_function set type = 'url' , action = '*' where function_cd = 'quantum_bd'; INSERT INTO `onap_sdk`.`microservicemodels` (`modelname`, `description`, `dependency`, `imported_by`, `attributes`, `ref_attributes`, `sub_attributes`, `version`, `enumValues`, `dataOrderInfo`, `annotation`) -VALUES ('SDNC_GenerateName', 'SRIOV 1806 Model', '[]', 'demo', 'policy-instance-name=string:defaultValue-null:required-null:MANY-false:description-null', 'naming-models=naming-model-entity:MANY-true:description-null,', '{"naming-property":{"property-value":"string:defaultValue-null:required-false:MANY-false:description-null","property-operation":"string:defaultValue-null:required-false:MANY-false:description-null","source-endpoint":"string:defaultValue-null:required-false:MANY-false:description-null","property-name":"string:defaultValue-null:required-true:MANY-false:description-null","increment-sequence":"increment-sequence:required-false:MANY-false:description-null","source-system":"string:defaultValue-null:required-false:MANY-false:description-null"},"increment-sequence":{"max":"string:defaultValue-null:required-false:MANY-false:description-null","scope":"SCOPE:defaultValue-null:required-true:MANY-false:description-null","start-value":"string:defaultValue-null:required-true:MANY-false:description-null","length":"integer:defaultValue-null:required-true:MANY-false:description-null","increment":"string:defaultValue-null:required-true:MANY-false:description-null","sequence-type":"string:defaultValue-null:required-false:MANY-false:description-null"},"naming-model-entity":{"naming-properties":"naming-property:required-true:MANY-true:description-null","name-operation":"string:defaultValue-null:required-false:MANY-false:description-null","naming-type":"string:defaultValue-null:required-true:MANY-false:description-null","nfRole":"string:defaultValue-null:required-false:MANY-false:description-null","naming-recipe":"String:defaultValue-null:required-true:MANY-false:description-null"}}', 'CSIT', 'SCOPE=[CLOUD_REGION_ID,LOCATION_CLLI,VNF,VM,VFMODULE,PRECEEDING,TRAILING,ENTIRETY,]', '\"[policy-instance-name,naming-models,nfRole,naming-type,naming-recipe,name-operation,naming-properties,property-name,property-value,property-operation,source-system,source-endpoint,increment-sequence,scope,sequence-type,start-value,max,increment,length]\"','naming-type=matching-true, nfRole=matching-true, property-name=matching-true'); +VALUES ('SDNC-GenerateName', 'SRIOV 1806 Model', '[]', 'demo', 'policy-instance-name=string:defaultValue-null:required-null:MANY-false:description-null', 'naming-models=naming-model-entity:MANY-true:description-null,', '{"naming-property":{"property-value":"string:defaultValue-null:required-false:MANY-false:description-null","property-operation":"string:defaultValue-null:required-false:MANY-false:description-null","source-endpoint":"string:defaultValue-null:required-false:MANY-false:description-null","property-name":"string:defaultValue-null:required-true:MANY-false:description-null","increment-sequence":"increment-sequence:required-false:MANY-false:description-null","source-system":"string:defaultValue-null:required-false:MANY-false:description-null"},"increment-sequence":{"max":"string:defaultValue-null:required-false:MANY-false:description-null","scope":"SCOPE:defaultValue-null:required-true:MANY-false:description-null","start-value":"string:defaultValue-null:required-true:MANY-false:description-null","length":"integer:defaultValue-null:required-true:MANY-false:description-null","increment":"string:defaultValue-null:required-true:MANY-false:description-null","sequence-type":"string:defaultValue-null:required-false:MANY-false:description-null"},"naming-model-entity":{"naming-properties":"naming-property:required-true:MANY-true:description-null","name-operation":"string:defaultValue-null:required-false:MANY-false:description-null","naming-type":"string:defaultValue-null:required-true:MANY-false:description-null","nfRole":"string:defaultValue-null:required-false:MANY-false:description-null","naming-recipe":"String:defaultValue-null:required-true:MANY-false:description-null"}}', 'CSIT', 'SCOPE=[CLOUD_REGION_ID,LOCATION_CLLI,VNF,VM,VFMODULE,PRECEEDING,TRAILING,ENTIRETY,]', '\"[policy-instance-name,naming-models,nfRole,naming-type,naming-recipe,name-operation,naming-properties,property-name,property-value,property-operation,source-system,source-endpoint,increment-sequence,scope,sequence-type,start-value,max,increment,length]\"','naming-type=matching-true, nfRole=matching-true, property-name=matching-true'); commit;
\ No newline at end of file @@ -59,6 +59,7 @@ <!-- Shared between policy/* project repositories - different version --> <!-- Project common dependency versions --> + <springframework.version>4.3.18.RELEASE</springframework.version> <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version> <httpclient.version>4.5.5</httpclient.version> <jackson.version>2.9.4</jackson.version> |