Commit 1234f0bf authored by Siiri Tann's avatar Siiri Tann
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Siiri Tann

See merge request teis/scheduler-service!41
parents 528e2c81 9fba2ad2
# Changelog
## [2.1.0] - 2022-11-04
* TEIS-3056: added minorsEmployments jobs
## [2.0.0] - 2022-08-12
* Upgraded to java 17, gradle 7.4.2, spring boot 2.6.8 and others; uses TEIS Gradle plugin 2.3.0
......
theGroup=ee.sm.ti.teis
theVersion=2.0.0
commonsVersion=2.6.0
commonApiGatewayVersion=2.5.0
theVersion=2.1.0
commonsVersion=2.12.0
commonApiGatewayVersion=2.10.0
adminApiGatewayVersion=2.0.0
pluginVersion=2.3.0
......@@ -4,11 +4,11 @@ spring:
datasource:
driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver
url: jdbc:tc:postgresql://localhost:5432/teis
username: teis
password: seis
username: testUser
password: testPass
liquibase:
user: teis
password: seis
user: testUser
password: testPass
change-log: classpath:/db/changelog/db.changelog-integtest.xml
contexts: integtest
camunda:
......
......@@ -78,7 +78,6 @@ spring:
management:
endpoint:
restart.enabled: false
health:
enabled: true
show-details: always
......@@ -102,6 +101,7 @@ teis:
ms-exchange-reply-timeout: ${RABBIT_TEMPLATE_MS_EXCHANGE_REPLY_TIMEOUT:5000}
cs-exchange-name: cache_exchange
od-exchange-name: od-disabled
ws-exchange-name: ws_disabled
scheduler:
job:
timeout: 1800
......
--liquibase formatted sql
/* @formatter:off */
--changeset siiri:2022-10-18.TEIS-3056.added-minors-employment-jobs
INSERT INTO job_definition (id, name, schedule_type, schedule_cron, schedule_interval, status, created_at, created_by) VALUES
('minorsEmployment.resetMinorsEmploymentNumberSequence', 'Alaealiste töötamise juhtumite numbri nullimine kord aastas 1. jaanuaril', 'CRON', '0 0 0 1 1 ?', -1, 'IDLE', NOW(), 'SYSTEM'),
('minorsEmployment.startTorUpdate', 'TÖR-st alaealiste töötamise kannete päringut käivitamine', 'CRON', '0 0 4 ? * * *', -1, 'IDLE', NOW(), 'SYSTEM');
Supports Markdown
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