Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Commit

Permalink
Merge c3baa5c into 1c814bf
Browse files Browse the repository at this point in the history
  • Loading branch information
wlzhn committed Apr 17, 2019
2 parents 1c814bf + c3baa5c commit 15f7a0a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ addons:
organization: "cjscommonplatform"
token:
secure: "ROwxs0F6YONAvYAL13MLeaGIcZX+Y9rLECLObridthOdlp0dqCdNfBGb67ls1S6l0l6Ktnl8AuCrxGNk8sq7k2PPM1lbqpCN5MlYPQQeu9Ta2Pv4g8dL3LDfwKRlcVklGYt1gERgzZt0h88jccSrJLx4DZre+ZRnZ+CRETErQrLQbOpT5PEfl3bZjgMHE/uZ9HwsVjonoUXn42vvM+pz4R222KuyHuaHOkUzziVOF9TOwmtIjYOerBQwJs9PMH8FstRhx8FNdMBsJuwqFXRfYEn6DURtjXjJekoOpOzb/SpuoLFjPqls43Y4PxnakcL7nvZ9j86dq2ubBV9M0JI8GztnjHVDZLXpjvtqvaSVOy+BrW066fqVevAAuVV12lul/OPyZmq1mnNSOlaVgGZ6/o73s782/7P8wasMWOYmnU2aKsEr4AYTJVq90ChM2GzQ5Uh2OZlov397CfVVglpWIdqiznJgHdq3c7X32HnKzJhIT1SWo0q/PPqYoT2BlT9um6IpTeT17guqcaB7KwbKyHkX4S7zz7LRMyIorrfwhR87fXBXdWkFwczL9JNaMMGZUID0Nf4Ujjwa2V6UJ4EtjTlGjzD7rLLWkrReQQzlmiiHPCUKXJ05GNcbRa2WZFD8c5SNKAFcGa83cVXOIcJBTzxaPGMHYhf2q2VbbRb18V0="
github_token:
secure: "haHu7kHLkwkaEQO13ugF+gnT9q0KSBuNM9sUSQg+y/O/BjBLnaaynjXOA+DIWTWmQtdL2ru2GZmE/wqPVAD6HUoFyukiYXMCJdoORvvGdCIJFmY0jiutHXmVY2c8DOBZDxAAGsqRvD4xne7OjY697qVPPsm8ZtUxEQaCEM3cjdgzX+cfIcFqK1glJqiovKX0GO+cmM7yvUBgcW6j0zj9/iuwuEZBGXTT6m5AMraHmOFfmTkKf6GH3NhPWezMIk8gq+QmqC9VKA9DQsbT4H6YDEhleFgzomklo8eVNrOvaDamW2TYUcFjIMD1ci0U1fmISAflvkJl2653MscPP+3ejPbad9EMuSC/Jl5saIa5oxHnjm6q/YEPpkUCzPuxUip0jrrgkxyLnE8DUOFGinQZh98nDnT8hiMmC/QC8Tgl3/puCoggq/nQPpXwOdFYZCVfnF+cdpMkUd5cHki7jq5fFBfn7Wk70gaqnFAVSrOaKtSwlwIb5GjRUI/3589lnyfee/YBGw5so/KF+n9H52/37gwzxg/8AuAr5acHxy9QZirUuymJx8TSRNrKfMxVOWoxkCEkYF+8Exlz/BCNkowu9IPz7rdEOgY3sxSloKjoGx7hQiYPpsoWXaEaOvo6v7EW0CF87xJlsTJSJLada1FxSy/IDS33QMCxpmH8z667DB8="
before_install:
- git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
- ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to

## [Unreleased]

## [1.18.0-M1] - 2019-04-17

## Changed
- Update utilities to version 1.17.0-M2
- Update test-utils to version 1.22.0-M1

## [1.17.4] - 2019-02-04

## Changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
import javax.inject.Inject;
import javax.json.JsonObject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Implementation of the {@link FileStorer} and {@link FileRetriever}
* interfaces, as the entry point into the file service.
Expand Down Expand Up @@ -72,4 +75,11 @@ public Optional<JsonObject> retrieveMetadata(final UUID fileId) throws FileServi
public void delete(final UUID fileId) throws FileServiceException {
fileStore.delete(fileId);
}

private static final Logger LOGGER = LoggerFactory.getLogger(FileService.class);
public void dodgyMethod() {
String DODGYVARIABLE = "dodgy";
LOGGER.info("dodgy: " + DODGYVARIABLE);
System.out.println("Invoke dodgy method");
}
}
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

<properties>
<common-bom.version>1.29.0</common-bom.version>
<cpp.utilities.version>1.16.4</cpp.utilities.version>
<cpp.test.utilities.version>1.22.0</cpp.test.utilities.version>
<cpp.utilities.version>1.17.0-M2</cpp.utilities.version>
<cpp.test.utilities.version>1.22.0-M1</cpp.test.utilities.version>

<cpp.repo.name>file-service</cpp.repo.name>
</properties>
Expand Down

0 comments on commit 15f7a0a

Please sign in to comment.