Skip to content

Commit 37f378b

Browse files
committed
More JDK 11 updates
1 parent 8ca7075 commit 37f378b

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

integration-tests/src/test/resources/scripts/generate-external-rest-identity-chain.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
4+
15
usage(){
26
cat <<EOF
37
Usage: $0 [options] -a <subject alternative names> -n <namespace>
@@ -111,7 +115,6 @@ OP_ROOT_PEM="${TEMP_DIR}/${OP_PREFIX}.root.pem"
111115
OP_CA_PEM="${TEMP_DIR}/${OP_PREFIX}.ca.pem"
112116
OP_CERT_PEM="${TEMP_DIR}/${OP_PREFIX}.cert.pem"
113117
OP_KEY_PEM="${TEMP_DIR}/${OP_PREFIX}.key.pem"
114-
KEYTOOL=/usr/java/jdk1.8.0_141/bin/keytool
115118

116119
# generate private keys (for operator-root and operator-ca)
117120

integration-tests/src/test/resources/scripts/legacy-generate-external-rest-identity.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44
#
55
# When the customer enables the operator's external REST api (by setting
@@ -83,7 +83,6 @@ OP_PKCS12="${TEMP_DIR}/${OP_PREFIX}.p12"
8383
OP_CSR="${TEMP_DIR}/${OP_PREFIX}.csr"
8484
OP_CERT_PEM="${TEMP_DIR}/${OP_PREFIX}.cert.pem"
8585
OP_KEY_PEM="${TEMP_DIR}/${OP_PREFIX}.key.pem"
86-
KEYTOOL=/usr/java/jdk1.8.0_141/bin/keytool
8786

8887
# generate a keypair for the operator's REST service, putting it in a keystore
8988
keytool \

kubernetes/samples/scripts/rest/generate-external-rest-identity.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ OP_PKCS12="${TEMP_DIR}/${OP_PREFIX}.p12"
138138
OP_CSR="${TEMP_DIR}/${OP_PREFIX}.csr"
139139
OP_CERT_PEM="${TEMP_DIR}/${OP_PREFIX}.cert.pem"
140140
OP_KEY_PEM="${TEMP_DIR}/${OP_PREFIX}.key.pem"
141-
KEYTOOL=/usr/java/jdk1.8.0_141/bin/keytool
142141

143142
# generate a keypair for the operator's REST service, putting it in a keystore
144143
keytool \

sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sonar.projectVersion=2.2
55

66
# Comma-separated paths to directories with sources (required)
77
sonar.sources=operator/src/main/java
8-
sonar.java.source=1.8
8+
sonar.java.source=11
99
sonar.java.binaries=operator/target/classes
1010

1111
# Language

0 commit comments

Comments
 (0)