diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2980a91..2d14df2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -23,100 +23,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -292,13 +212,6 @@ @@ -655,7 +575,6 @@ - + - + @@ -713,38 +633,42 @@ + + + + - + - - + + - - + + - - + + - + @@ -782,13 +706,13 @@ - + - + diff --git a/Jenkinsfile b/Jenkinsfile index e0c6afd..84b0486 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,8 @@ pipeline { steps { sh "docker-compose up -d" sh "ssh jenkins@s5000xvn echo 'Dupa dupa dupa'" - sh "DOCKER_HOST=“ssh://jenkins@s5000xvn:22” docker-compose up -d" + sh "export DOCKER_HOST=tcp://jenkins@s5000xvn:22" + sh "docker-compose up -d" } } stage('Logs') { diff --git a/src/main/java/com/release11/klaus/config/LocalDiscovery.java b/src/main/java/com/release11/klaus/config/LocalDiscovery.java index dbeff5d..fe65521 100644 --- a/src/main/java/com/release11/klaus/config/LocalDiscovery.java +++ b/src/main/java/com/release11/klaus/config/LocalDiscovery.java @@ -2,9 +2,7 @@ package com.release11.klaus.config; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -@Profile("local-discovery") @Configuration @EnableDiscoveryClient public class LocalDiscovery { diff --git a/target/classes/application.properties b/target/classes/application.properties index 10662de..fbd3164 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,3 +1,4 @@ +spring.application.name=klaus server.port = 8097 spring.output.ansi.enabled = always diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java index aaab9aa..dfea120 100644 --- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java +++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2020-09-29T14:10:20+0200", + date = "2020-09-29T14:50:18+0200", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)" ) @Component