This commit is contained in:
Baikov Dmitrii 2019-01-22 11:43:59 +03:00 committed by GitHub
parent e031c45550
commit 2953d63706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 5 deletions

2
Jenkinsfile vendored
View File

@ -10,7 +10,7 @@ build('midgard', 'java-maven') {
def serviceName = env.REPO_NAME
def mvnArgs = '-DjvmArgs="-Xmx256m"'
def useJava11 = false
def useJava11 = true
javaServicePipeline(serviceName, useJava11, mvnArgs)
}

64
pom.xml
View File

@ -11,22 +11,24 @@
</parent>
<groupId>com.rbkmoney</groupId>
<artifactId>midgard-service</artifactId>
<version>1.0.0</version>
<artifactId>midgard</artifactId>
<version>1.0.1</version>
<name>Midgard</name>
<name>midgard</name>
<description>Application for work with clearing data</description>
<properties>
<project.maintainer>Dmitrii Baikov &lt;d.baykov@rbkmoney.com&gt;</project.maintainer>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dockerfile.base.service.tag>4f3b89c6381373923f5fdea18b08741b9bada1e6</dockerfile.base.service.tag>
<!-- RBK.Money environment settings -->
<damsel.version>1.267-5711f53</damsel.version>
<fistful-proto.version>1.8-37ccefb</fistful-proto.version>
<shared.resources.version>0.3.3</shared.resources.version>
<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
<!-- port for connection -->
<!-- Ports -->
<server.port>8022</server.port>
<exposed.ports>${server.port}</exposed.ports>
<!-- Environment settings -->
<flyway.version>5.2.4</flyway.version>
<jooq.version>3.11.7</jooq.version>
@ -228,6 +230,27 @@
</dependencies>
<build>
<resources>
<resource>
<directory>${project.build.directory}/maven-shared-archive-resources</directory>
<targetPath>${project.build.directory}</targetPath>
<includes>
<include>Dockerfile</include>
</includes>
<filtering>true</filtering>
</resource>
<resource>
<directory>${project.build.directory}/maven-shared-archive-resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>Dockerfile</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@ -353,6 +376,39 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
<version>1.3</version>
</dependency>
</dependencies>
<configuration>
<resourceBundles>
<resourceBundle>com.rbkmoney:shared-resources:${shared.resources.version}</resourceBundle>
</resourceBundles>
<attachToMain>false</attachToMain>
<attachToTest>false</attachToTest>
</configuration>
<executions>
<execution>
<goals>
<goal>process</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>