Skip to content

Commit 368abd1

Browse files
vjkoskelaBrandonArp
authored andcommitted
Default to no database configurations (#76)
1 parent 70a4c4d commit 368abd1

File tree

5 files changed

+134
-7
lines changed

5 files changed

+134
-7
lines changed

.jdkw

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
JDKW_VERSION=8u152
2-
JDKW_BUILD=b16
3-
JDKW_TOKEN=aa0333dd3019491ca4f6ddbe78cdb6d0
1+
JDKW_RELEASE=latest
2+
JDKW_DIST=zulu
3+
JDKW_BUILD=8.27.0.7
4+
JDKW_VERSION=8.0.162
5+
JDKW_VERBOSE=true

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ addons:
1212
env:
1313
global:
1414
- TARGET=install
15-
- JDKW=https://raw.githubusercontent.com/vjkoskela/jdk-wrapper/master/jdk-wrapper.sh
1615
- secure: jpTQGbymmpa0WE0QqwTK3sg2kOqgrJ7/XwyFFsr7+rfF4a5YHTbEJ10ApB3Q+TrIT5/irOZr/vqUcX1nEl4BE/vqGnBiJxowvc8Hoq3V33UlqriWvV6SVcLBRtzsI9YB3g91RawokuPIU9EjsmgokJ1cdDbSpTAqDLccKHBupA2QpI5kaynVcuXu3RWXBXEIIj0oE2uxBsJVxGuIwP3ps24rAsnklOB2neQrVcoCeZyku+v+kwRd8dcQQXqg/X4D0N/Vt23bwlWXR9CxMiU4MdywedSIC6h0w2rUeqzTu/wl8qk6Mf1gs/GfkszU/6O6s8cWIlCylPnVhQ6VXlyUmbhkJOmzGUxurGKViR9aDmnCU+fRoyz2Dbnd9U2OrRzc1vg/KtT6dz+IHZ+9IB5gfkz24XzfnJBbP2745i+aLETV8HuMSTayvnKzujgw3is6e1OKNN6LnsFVQYqStOQ8afGESks4igsQZvAck0I9xXsZGyC2NNZRtmd9kcq7c0xOaQO8g1kjJEwO51vO3pWPHVj4Z8tMa6Uqfktqeu0y9il4LEoKryJHGFeaLY9giDLD12T7JbBjGI4xqlFnd5kSEUp/4YL0r6FIrhTPD2MXShq8z7+iGMJfDVlY1rjkb6LPejr4ZkyaYPeears5FZlXP38tJgNDR9jDkZJe/GTyUXQ=
1716
- secure: fNkPe74gPWuwl+pBhz6dRhHo2y/mihEuaYQtbMwtO1xyz8UJYRUWjncRPZV/XFgB8O/VcdQi4YQcOnddAGBy85Dx5XsVnj+w+/j4hbNvkU46Dklym2IoWjQlV3MRhuWER4XHT1UpGxb9jFf2z7vAr/H/X7w1aDo7RleQ3CDIRFMvy+0b/bWZG7/6wjnzSk8SKJVkO2fMAl0cW8Yj2kG1ZImiPcUv1DW5xUKk2QChOHGJso+09eRTdprQ3lVwjMIG/0cy6HDETMLs5GkEp/zG9MJ/RgCZJwTrZ6WCz0UpqTKFEfBLkqNZHfvw62gGAsI3m2v7Whn39Qxyq9m2VXgXLHPSln/D6opN9Woe9588TwxWmsUqx1SABceOnYzcLxjUcFr+6UNaakfzNrkzExYPdFo3H5FHMFhyVRXqJ2RlTrZsAMIlQl8CL/4mt0vC5Oz5W3wbIsB7RbvoywC1oRDZGTbwJ0JtQXi2YJMT8kGvY3ZTRpkgA+nncDkd63R72pomFcdwtDtoJHdadZOr3kl6cDftQdFW5lr84trAPyO5uIvzQw3jzDz55oLjOyNlHK1gNmMjXAqXDd5qWWRssGbL8P2pfa/Ef+0oP2QCzE2BCeQrWtXzRthervKpYiTtjEkQe+QSUGVsaHnQmMLgyyY/jD+1fEuiscd5AljQQIrPbYc=
1817
- secure: JLqLcG9IUTl+odtuYNhKeTng0a/KNdkqU5tqaID8L/ZqbXlsuwjkkRuMKGm3LSdMRFj+EWD/sztRiEtsNXT9fsvl8grwrEpBhnGZy0TLDJ0FfkLl2BpvaOGgytR69eqNTTmvUnGTYZLzUHionl99FiN8/JcxkP6bKvEaJpJYYNOiSz8YmlHrE6HZTLu9+04xCrugLE4fwcK7PidaXL2uwn97M5JBOZqk3347WJCSM135vVrMyaFpnECGPCdlYX57SNZvW/hzM1phChluGLmqXLo5REc51QOm9SbT9PLCBK3oIobjDYBai+1eFxPjWz4HoEx/qrO0MTEb5a/nlZOQZsygbFAe66UN1wv/aM0DuQvk1rXzEZXQfCzvqKMCMow7LAAThIVACXyiRwH81ged3pmPcTyM2MiT+cJhWttwdJwgTeIjxVnBqFCOur795RwJD5CAZjIq9o3IqG2qwxMnYZs/3JIc0d4OkWMB9DlzPZ/QCQZErLhixw0N/NbXvz5WpBR631lvQvBr0Fz8qe9GKrWrkUK+7B3dIFV+Sp8gn2bP9n3FsTgXkBUn2p87sizk6QqyeNRvngvjZRGHSzLPWk0oCCJgR3/zSu0vfyti13opb2i5WVkzWRpGcXJctpI4l+YYASVmPl9KoGAaQuCw8FTlCWjJnQnyZwXD1pPjf68=
@@ -23,7 +22,7 @@ before_script:
2322
- gpg --import arpnetworking.key
2423
- if [ \( -n "${TRAVIS_TAG}" \) -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then export TARGET="deploy -P release --settings settings.xml"; fi;
2524
script:
26-
- curl -s ${JDKW} | bash /dev/stdin ./mvnw clean ${TARGET} -P rpm -U
25+
- ./jdk-wrapper.sh ./mvnw clean ${TARGET} -P rpm -U
2726
deploy:
2827
provider: releases
2928
api_key:

jdk-wrapper.sh

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
#!/bin/sh
2+
3+
# Copyright 2018 Ville Koskela
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
# For documentation please refer to:
18+
# https://github.com/KoskiLabs/jdk-wrapper/blob/master/README.md
19+
20+
log_err() {
21+
l_prefix=$(date +'%H:%M:%S')
22+
printf "[%s] %s\n" "${l_prefix}" "$@" 1>&2;
23+
}
24+
25+
log_out() {
26+
if [ -n "${JDKW_VERBOSE}" ]; then
27+
l_prefix=$(date +'%H:%M:%S')
28+
printf "[%s] %s\n" "${l_prefix}" "$@"
29+
fi
30+
}
31+
32+
safe_command() {
33+
l_command=$1
34+
log_out "${l_command}";
35+
eval $1
36+
l_result=$?
37+
if [ "${l_result}" -ne "0" ]; then
38+
log_err "ERROR: ${l_command} failed with ${l_result}"
39+
exit 1
40+
fi
41+
}
42+
43+
download() {
44+
file="$1"
45+
if [ ! -f "${JDKW_PATH}/${file}" ]; then
46+
jdkw_url="${JDKW_URI}/${file}"
47+
log_out "Downloading ${file} from ${jdkw_url}"
48+
safe_command "curl ${CURL_OPTIONS} -f -k -L -o \"${JDKW_PATH}/${file}\" \"${jdkw_url}\""
49+
safe_command "chmod +x \"${JDKW_PATH}/${file}\""
50+
fi
51+
}
52+
53+
# Default curl options
54+
CURL_OPTIONS=""
55+
56+
# Load properties file in home directory
57+
if [ -f "${HOME}/.jdkw" ]; then
58+
. "${HOME}/.jdkw"
59+
fi
60+
61+
# Load properties file in working directory
62+
if [ -f ".jdkw" ]; then
63+
. "./.jdkw"
64+
fi
65+
66+
# Process command line arguments
67+
for ARG in "$@"; do
68+
JDKW_ARG=$(echo "${ARG}" | grep 'JDKW_.*')
69+
if [ -n "${JDKW_ARG}" ]; then
70+
eval ${ARG}
71+
else
72+
break
73+
fi
74+
done
75+
76+
# Globals
77+
JDKW_BASE_URI="https://github.com/KoskiLabs/jdk-wrapper"
78+
JDKW_IMPL="jdkw-impl.sh"
79+
JDKW_WRAPPER="jdk-wrapper.sh"
80+
81+
# Process configuration
82+
if [ -z "${JDKW_RELEASE}" ]; then
83+
JDKW_RELEASE="latest"
84+
log_out "Defaulted to version ${JDKW_RELEASE}"
85+
fi
86+
if [ -z "${JDKW_TARGET}" ]; then
87+
JDKW_TARGET="${HOME}/.jdk"
88+
log_out "Defaulted to target ${JDKW_TARGET}"
89+
fi
90+
if [ -z "${JDKW_VERBOSE}" ]; then
91+
CURL_OPTIONS="${CURL_OPTIONS} --silent"
92+
fi
93+
94+
# Resolve latest version
95+
if [ "${JDKW_RELEASE}" = "latest" ]; then
96+
JDKW_RELEASE=$(curl ${CURL_OPTIONS} -f -k -L -H 'Accept: application/json' "${JDKW_BASE_URI}/releases/latest" | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/')
97+
log_out "Resolved latest version to ${JDKW_RELEASE}"
98+
fi
99+
100+
# Define source and target
101+
JDKW_URI="${JDKW_BASE_URI}/releases/download/${JDKW_RELEASE}"
102+
JDKW_PATH="${JDKW_TARGET}/jdkw/${JDKW_RELEASE}"
103+
104+
# Ensure target directory exists
105+
if [ ! -d "${JDKW_PATH}" ]; then
106+
log_out "Creating target directory ${JDKW_PATH}"
107+
safe_command "mkdir -p \"${JDKW_PATH}\""
108+
fi
109+
110+
# Download the jdk wrapper version
111+
download "${JDKW_IMPL}"
112+
download "${JDKW_WRAPPER}"
113+
114+
# Check whether this wrapper is the one specified for this version
115+
jdkw_download="${JDKW_PATH}/${JDKW_WRAPPER}"
116+
jdkw_current="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)/$(basename "$0")"
117+
if [ "$(cat "${jdkw_download}" | sha1sum )" != "$(cat "${jdkw_current}" | sha1sum)" ]; then
118+
printf "\e[0;31m[WARNING]\e[0m Your jdk-wrapper.sh file does not match the one in your JDKW_RELEASE.\n"
119+
printf "\e[0;32mUpdate your jdk-wrapper.sh to match by running:\e[0m\n"
120+
printf "cp \"%s\" \"%s\"\n" "${jdkw_download}" "${jdkw_current}"
121+
fi
122+
123+
# Execute the provided command
124+
${JDKW_PATH}/${JDKW_IMPL} $@
125+
exit $?

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.arpnetworking.build</groupId>
2020
<artifactId>arpnetworking-parent-pom</artifactId>
21-
<version>1.1.3</version>
21+
<version>1.1.4</version>
2222
<relativePath />
2323
</parent>
2424

src/main/java/com/arpnetworking/clusteraggregator/configuration/ClusterAggregatorConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ public Builder setCalculateClusterAggregations(final Boolean value) {
446446
private String _clusterHostSuffix = "";
447447
@NotNull
448448
private Boolean _calculateClusterAggregations = true;
449-
private Map<String, DatabaseConfiguration> _databaseConfigurations;
449+
@NotNull
450+
private Map<String, DatabaseConfiguration> _databaseConfigurations = Maps.newHashMap();
450451
}
451452
}

0 commit comments

Comments
 (0)