Skip to content

Commit 7c58bab

Browse files
authored
Merge pull request #167 from rosette-api/ws-2053-Rosette-Server-exposes-license-expiration-date
WS-2053 Rosette Server exposes license expiration date
2 parents 1240fff + 36398c4 commit 7c58bab

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
arch: amd64
2+
os: linux
3+
dist: trusty
14
language: java
25
script: mvn clean verify
36
jdk:
47
- oraclejdk8
58
- openjdk8
6-
7-
# suggested by travis support.
8-
sudo: required
9-
dist: trusty
10-
group:
11-
12-
sudo: required
9+
notifications:
10+
slack:
11+
secure: WZMfOBd4zX7SOjeIzCpXGu2vCXwrBQBK3mXkPfn8VaAhwQkAiL7VnonDS19YVMfSm0eG5S9uZKT1wSzZFKvTmw7KEeDkD1rLfdqjbmIzT9W0iwG31mY+Q8gKBN1Dg9dSrCtwC3LkhXhvv4UjzVZ+FnJlrMzEVT+QUrHcQHSqt+uM5Mxz83pj+ZM8eqviODVxSzTwWD4Lqromvq7nplUO45MOrAIhY0Jau0sst2ysAiQXayqSXI33YC2xUJkPcNdypLGOsZ0bWIs68yXfxTMgDVB1+acRw9AFPDMapHUiiueqkJgZ/Itn643iAG4wftGza4OMnTPHpe3hQGp5kM4cqcqvuVmz29wQUWjpOUCqX4e6AoQfV+9jAC81tzbEX89HyyKUf/tAgxe/BefjduSSwT+hlV0WPXOdp4YIyA9YykAPdWlAceYJPipG9sJOWEKekfxojIiRpH2Ha/aV3T0ZgaHlWeoxIwDYgMZeIZxTvRoOwK3SxQzP5cPqh3yj0brJ9d1Z090Vo8qX1/tRt0OXT966Z/yC4MEurhJDNPBbSuBTQpqH+ayhObLnIxXpinPQSEA0fF5votVgZU20ZQDW8SOLPLyP+ZJ5qfUxbvhkLEk7GlO0rlD5xhXjG288u5vEwsWKYXDQ2TVdJdBXIflLxvPhIk8fo/JClnosTlbc9eg=

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ def slack(boolean success) {
2626
def color = success ? "#00FF00" : "#FF0000"
2727
def status = success ? "SUCCESSFUL" : "FAILED"
2828
def message = status + ": Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
29-
slackSend(color: color, channel: "#rapid", message: message)
30-
}
29+
slackSend(color: color, channel: "#p-n-c_jenkins", message: message)
30+
}

Jenkinsfile.examples

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ def slack(boolean success) {
3434
def color = success ? "#00FF00" : "#FF0000"
3535
def status = success ? "SUCCESSFUL" : "FAILED"
3636
def message = status + ": Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
37-
slackSend(color: color, channel: "#rapid", message: message)
38-
}
37+
slackSend(color: color, channel: "#p-n-c_jenkins", message: message)
38+
}

json/src/test/data/InfoResponse.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"buildNumber": "6bafb29d",
33
"buildTime": "2015.05.08_12:31:26",
44
"name": "Rosette API",
5-
"version": "0.5.0"
5+
"version": "0.5.0",
6+
"licenseExpiration": "Nov 19, 2020"
67
}

model/src/main/java/com/basistech/rosette/apimodel/InfoResponse.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,9 @@ public class InfoResponse extends Response {
5454
* @return client version checked
5555
*/
5656
private final Boolean versionChecked;
57+
58+
/**
59+
* @return the license expiration date
60+
*/
61+
private final String licenseExpiration;
5762
}

0 commit comments

Comments
 (0)