Commit a47f3c10 authored by Kristel Meikas's avatar Kristel Meikas
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Kristel Meikas

See merge request teis/classifiers-service!81
parents 6424c8b2 af0879fa
# Changelog
## [1.19.0] - 2021-03-22
* TEIS-2041: fixed Gradle dependency management (moved dependencies from root Gradle configuration to service level)
* TEIS-1566: updated scheduler-lib dependency to latest for depending micro services
* TEIS-2039: rerun data import scripts, added system profiles and additional checks to deleting old and importing new RA
settings data
## [1.18.0] - 2021-03-08
* TEIS-2018: added new classifier items OBJECT_TYPE__PROCEEDING_WEB_LINK and OBJECT_TYPE__PROCEEDING_FILE
......
......@@ -53,11 +53,4 @@ allprojects {
'Implementation-Version': project.version)
}
}
dependencies {
compile ("ee.sm.ti.teis:domain-cache-lib:${commonsVersion}")
compile "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
compile "ee.sm.ti.teis:scheduler-service-lib:${schedulerVersion}"
compile "ee.sm.ti.teis:office-api-gateway-lib:${officeApiGatewayVersion}"
}
}
theGroup=ee.sm.ti.teis
theVersion=1.18.0
commonsVersion=1.21.0
officeApiGatewayVersion=1.21.0
schedulerVersion=1.14.0
theVersion=1.19.0
commonsVersion=1.22.0
officeApiGatewayVersion=1.22.0
schedulerVersion=1.15.0
pluginVersion=1.3.0
......@@ -8,5 +8,17 @@ functionalities {
apply from: this.getClass().getClassLoader().getResource('teis.integrationTest.gradle')
apply from: this.getClass().getClassLoader().getResource('teis.microservice.gradle')
dependencies {
implementation "ee.sm.ti.teis:domain-cache-lib:${commonsVersion}"
implementation "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
implementation "ee.sm.ti.teis:scheduler-service-lib:${schedulerVersion}"
implementation "ee.sm.ti.teis:office-api-gateway-lib:${officeApiGatewayVersion}"
integTestImplementation "ee.sm.ti.teis:domain-cache-lib:${commonsVersion}"
integTestImplementation "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
integTestImplementation "ee.sm.ti.teis:scheduler-service-lib:${schedulerVersion}"
integTestImplementation "ee.sm.ti.teis:office-api-gateway-lib:${officeApiGatewayVersion}"
}
// Define the main class for the application
mainClassName = 'ee.sm.ti.teis.App'
......@@ -100,8 +100,8 @@ VALUES
('RISK_BUSINESS_TYPE_CATEGORY__PLACEHOLDER_FOR_TESTING', 'RISK_BUSINESS_TYPE_CATEGORY', 'PLACEHOLDER_FOR_TESTING', TRUE, 'TEST Ajutine klassifikaator testimiseks', 'CURRENT', 100000004, null, now(), null, null),
('RISK_BUSINESS_TYPE_CATEGORY__PLACEHOLDER_FOR_TESTING2', 'RISK_BUSINESS_TYPE_CATEGORY', 'PLACEHOLDER_FOR_TESTING2', TRUE, 'TEST Ajutine klassifikaator 2 testimiseks, deleted', 'DELETED', 100000005, null, now(), null, null),
('RISK_BUSINESS_TYPE_CATEGORY__PLACEHOLDER_FOR_TESTING3', 'RISK_BUSINESS_TYPE_CATEGORY', 'PLACEHOLDER_FOR_TESTING3', TRUE, 'TEST Ajutine klassifikaator 3 testimiseks', 'CURRENT', 100000006, null, now(), null, null),
('RISK_FACTOR_CATEGORY__PLACEHOLDER_FOR_TESTING', 'RISK_FACTOR_CATEGORY', 'PLACEHOLDER_FOR_TESTING', FALSE, 'TEST Placeholder for testing risk factor category', 'CURRENT', 100000005, null, now(),null,null),
('RISK_FACTOR_CATEGORY__PLACEHOLDER_FOR_TESTING2', 'RISK_FACTOR_CATEGORY', 'PLACEHOLDER_FOR_TESTING2', FALSE, 'TEST Placeholder for testing risk factor category, deleted', 'DELETED', 100000006, null, now(),null,null);
('RISK_FACTOR_CATEGORY__PLACEHOLDER_FOR_TESTING', 'RISK_FACTOR_CATEGORY', 'PLACEHOLDER_FOR_TESTING', FALSE, 'TEST Placeholder for testing risk factor category', 'CURRENT', 100000007, null, now(),null,null),
('RISK_FACTOR_CATEGORY__PLACEHOLDER_FOR_TESTING2', 'RISK_FACTOR_CATEGORY', 'PLACEHOLDER_FOR_TESTING2', FALSE, 'TEST Placeholder for testing risk factor category, deleted', 'DELETED', 10000008, null, now(),null,null);
/*ATTRIBUTE VALUES*/
INSERT INTO classifier_attribute_value (id, object_status, classifier_item_id, classifier_attribute_definition_id, value)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment