valitydev/file-storage
14
0
Fork 0
mirror of https://github.com/valitydev/file-storage.git synced 2024-11-06 08:45:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump parent pom and build_utils (#21)

Browse Source 
* Bump parent pom and build_utils

* Fix compilation error

* Bump easyway
This commit is contained in:
Pavel Popov 2020-07-29 10:56:58 +03:00 committed by GitHub
parent 8ac5a75330
commit 25506ff3de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -11,8 +11,6 @@ build('file-storage', 'java-maven') {
def serviceName = env.REPO_NAME
def mvnArgs = '-DjvmArgs="-Xmx256m"'
def useJava11 = true
def registry = 'dr2.rbkmoney.com'
def registryCredsId = 'jenkins_harbor'
javaServicePipeline(serviceName, useJava11, mvnArgs, registry, registryCredsId)
javaServicePipeline(serviceName, useJava11, mvnArgs)
}

2
build_utils

@ -1 +1 @@
Subproject commit 1c066106d80aa95d053424d5dc7e9d976012ca2e
Subproject commit 34f432a1e8e0adedbba23ecd29c1eb2412a8d416

14
pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.rbkmoney</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.1.RELEASE</version>
<version>2.3.1.RELEASE</version>
<relativePath/>
</parent>
@ -26,14 +26,14 @@
<exposed.ports>${server.port}</exposed.ports>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<metrics.version>1.1.0</metrics.version>
<metrics.version>1.1.2</metrics.version>
<dockerfile.base.service.tag>c0d0900ec19c907d866f8360031a836049985110</dockerfile.base.service.tag>
<!-- <dockerfile.registry>dr2.rbkmoney.com</dockerfile.registry>-->
<dockerfile.registry>${env.REGISTRY}</dockerfile.registry>
<shared.resources.version>0.3.6</shared.resources.version>
<woody.thrift.version>1.1.15</woody.thrift.version>
<shared.resources.version>0.3.8</shared.resources.version>
<woody.thrift.version>1.1.22</woody.thrift.version>
<file.storage.proto.version>1.24-a77c0c4</file.storage.proto.version>
<geck.version>0.6.8</geck.version>
<geck.version>0.6.11</geck.version>
</properties>
<dependencies>
@ -104,7 +104,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
@ -141,7 +141,7 @@
<dependency>
<groupId>com.rbkmoney</groupId>
<artifactId>easyway</artifactId>
<version>0.1.0</version>
<version>0.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>

4
src/main/java/com/rbkmoney/file/storage/util/CheckerUtil.java
View File

@ -1,11 +1,11 @@
package com.rbkmoney.file.storage.util;
import com.google.common.base.Strings;
import org.springframework.util.StringUtils;
public class CheckerUtil {
public static void checkString(String string, String exMessage) {
if (Strings.isNullOrEmpty(string) || string.contains(" ")) {
if (StringUtils.isEmpty(string) || string.contains(" ")) {
throw new IllegalArgumentException(exMessage);
}
}