Skip to content

Commit 4225d8e

Browse files
committed
openjdk11
1 parent 984434f commit 4225d8e

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
sudo: false
22
language: java
33
jdk:
4-
- oraclejdk8
4+
- openjdk8
5+
- openjdk11
56
script:
67
- ./build.sh
7-
after_script:
8-
- find -name TEST* -exec cat {} \;
98
notifications:
109
email: false

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33

44
Changelog of Violation comments to bitbucket server lib.
55

6+
## Unreleased
7+
### No issue
8+
9+
**openjdk11**
10+
11+
12+
[4805d4dfdae24fd](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/4805d4dfdae24fd) Tomas Bjerre *2019-06-12 06:26:46*
13+
14+
**doc**
15+
16+
17+
[984434f146731b7](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/984434f146731b7) Tomas Bjerre *2019-06-01 13:40:25*
18+
19+
620
## 1.87
721
### No issue
822

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/client/BitbucketServerInvoker.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import java.io.BufferedReader;
88
import java.io.IOException;
99
import java.io.InputStreamReader;
10-
import java.io.UnsupportedEncodingException;
1110
import java.net.CookieHandler;
1211
import java.net.CookieManager;
1312
import java.net.CookiePolicy;
1413
import java.net.URI;
15-
import javax.xml.bind.DatatypeConverter;
14+
import java.nio.charset.StandardCharsets;
15+
import java.util.Base64;
1616
import org.apache.http.HttpResponse;
1717
import org.apache.http.client.HttpClient;
1818
import org.apache.http.client.config.RequestConfig;
@@ -55,12 +55,8 @@ public String invokeUrl(
5555
final ProxyConfig proxyConfig) {
5656

5757
final String userAndPass = bitbucketServerUser + ":" + bitbucketServerPassword;
58-
String authString;
59-
try {
60-
authString = DatatypeConverter.printBase64Binary(userAndPass.getBytes("UTF-8"));
61-
} catch (final UnsupportedEncodingException e1) {
62-
throw new RuntimeException(e1);
63-
}
58+
final String authString =
59+
Base64.getEncoder().encodeToString(userAndPass.getBytes(StandardCharsets.UTF_8));
6460
final String authorizationValue = "Basic " + authString;
6561

6662
return doInvokeUrl(violationsLogger, url, method, postContent, authorizationValue, proxyConfig);

0 commit comments

Comments
 (0)