Commit a7a3431d authored by Siiri Tann's avatar Siiri Tann
Browse files

Merge branch 'develop-2.0' into 'develop'

develop-2.0

See merge request teis/files-service!83
parents 4d1b61f5 2fae21c7
......@@ -4,6 +4,8 @@ stages:
- deploy
- cve-test
image: docker.repo.tehik.ee/gradle:jdk17
variables:
USE_POSTGRES: "true"
USE_RABBIT: "true"
......
......@@ -19,31 +19,20 @@ buildscript {
}
}
apply plugin: 'ee.sm.ti.teis'
allprojects {
subprojects {
apply plugin: 'ee.sm.ti.teis'
functionalities {
base
}
repositories {
mavenLocal()
maven {
url "${gradle.ext.artifactoryUrl}/${gradle.ext.artifactoryRepoKey}"
credentials {
username = "${gradle.ext.artifactoryUser}"
password = "${gradle.ext.artifactoryPass}"
}
}
jcenter()
}
group = "${theGroup}"
version = "${theVersion}"
sourceCompatibility = 11
targetCompatibility = 11
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
jar {
manifest {
......
theGroup=ee.sm.ti.teis
theVersion=1.25.0
commonsVersion=1.34.0
commonApiGatewayVersion=1.34.0
pluginVersion=1.5.0
theVersion=2.0.0-SNAPSHOT
commonsVersion=2.0.0
commonApiGatewayVersion=2.0.0
pluginVersion=2.0.1
schedulerVersion=1.18.0
#Tue Nov 12 11:52:19 EET 2019
distributionUrl=https\://repo.tehik.ee/artifactory/gradle-distributions/gradle-5.6.4-bin.zip
distributionUrl=https\://repo.tehik.ee/artifactory/gradle-distributions/gradle-7.4.2-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
......
description = """files-service-lib"""
apply plugin: 'io.spring.dependency-management'
functionalities{
library
}
description = """files-service-lib"""
dependencyManagement {
imports {
mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
}
}
dependencies {
implementation 'org.hibernate:hibernate-core:5.4.22.Final'
......
gradle.ext.artifactoryUrl = hasProperty('ARTIFACTORY_URL') ? ARTIFACTORY_URL : System.getenv('ARTIFACTORY_URL')
gradle.ext.artifactoryUser = hasProperty('ARTIFACTORY_USER') ? ARTIFACTORY_USER : System.getenv('ARTIFACTORY_USER')
gradle.ext.artifactoryPass = hasProperty('ARTIFACTORY_PASS') ? ARTIFACTORY_PASS : System.getenv('ARTIFACTORY_PASS')
gradle.ext.artifactoryRepoKey = hasProperty('ARTIFACTORY_REPO_KEY') ? ARTIFACTORY_REPO_KEY : System.getenv('ARTIFACTORY_REPO_KEY')
rootProject.name='files-service-lib'
......@@ -11,7 +11,7 @@ apply from: this.getClass().getClassLoader().getResource('teis.integrationTest.g
apply from: this.getClass().getClassLoader().getResource('teis.microservice.gradle')
dependencies {
compile project(':files-service-lib')
implementation project(':files-service-lib')
implementation "ee.sm.ti.teis:files-client-lib:${commonsVersion}"
implementation "ee.sm.ti.teis:scheduler-service-lib:${schedulerVersion}"
......@@ -22,26 +22,7 @@ dependencies {
implementation "ee.sm.ti.teis:bpm-lib:${commonsVersion}"
implementation 'net.coobird:thumbnailator:0.4.12'
integTestImplementation "ee.sm.ti.teis:files-client-lib:${commonsVersion}"
integTestImplementation "ee.sm.ti.teis:scheduler-service-lib:${schedulerVersion}"
integTestImplementation "ee.sm.ti.teis:common-api-gateway-lib:${commonApiGatewayVersion}"
integTestImplementation "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
integTestImplementation "ee.sm.ti.teis:domain-request-lib:${commonsVersion}"
integTestImplementation "ee.sm.ti.teis:service-request-lib:${commonsVersion}"
integTestImplementation "ee.sm.ti.teis:bpm-lib:${commonsVersion}"
integTestImplementation 'net.coobird:thumbnailator:0.4.12'
integTestImplementation 'org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-webapp:3.2.1'
integTestImplementation 'org.springframework.boot:spring-boot-starter-webflux:2.3.4.RELEASE'
}
// Define the main class for the application
mainClassName = 'ee.sm.ti.teis.FilesServiceApp'
test {
testLogging {
events "passed", "skipped", "failed"
}
}
......@@ -8,7 +8,6 @@ spring:
url: jdbc:postgresql://${DB_HOST}:5432/files_service
username: ${DB_APP_USERNAME}
password: ${DB_APP_PASSWORD}
initialization-mode: never
liquibase:
change-log: classpath:/db/changelog/db.changelog-master.xml
user: ${DB_OWNER_USERNAME}
......
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0w84gse" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.1.0">
<bpmn:process id="Process_11seh29" isExecutable="true" camunda:historyTimeToLive="7">
<bpmn:process id="Process_11seh29" isExecutable="true" camunda:historyTimeToLive="14">
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>Flow_1977z6x</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_1kmaflh" messageRef="Message_1xkffmy" />
......
......@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<include file="classpath:common/db/changelog/common-master.xml"/>
<include file="classpath:common/db/changelog/camunda-7-10.xml"/>
<include file="classpath:common/db/changelog/camunda.xml"/>
<includeAll path="domain" relativeToChangelogFile="true"/>
<includeAll path="data" relativeToChangelogFile="true"/>
......
......@@ -3,6 +3,21 @@ gradle.ext.artifactoryUser = hasProperty('ARTIFACTORY_USER') ? ARTIFACTORY_USER
gradle.ext.artifactoryPass = hasProperty('ARTIFACTORY_PASS') ? ARTIFACTORY_PASS : System.getenv('ARTIFACTORY_PASS')
gradle.ext.artifactoryRepoKey = hasProperty('ARTIFACTORY_REPO_KEY') ? ARTIFACTORY_REPO_KEY : System.getenv('ARTIFACTORY_REPO_KEY')
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
repositories {
mavenLocal()
maven {
url "${gradle.ext.artifactoryUrl}/${gradle.ext.artifactoryRepoKey}"
credentials {
username = "${gradle.ext.artifactoryUser}"
password = "${gradle.ext.artifactoryPass}"
}
}
mavenCentral()
}
}
include 'service'
include 'service-lib'
......
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