Skip to content

Commit 0048e95

Browse files
authored
Checkstyle updates. (#86)
1 parent 9b1a135 commit 0048e95

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+198
-85
lines changed

.jdkw

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
JDKW_VERSION=8u131
2-
JDKW_BUILD=b11
3-
JDKW_TOKEN=d54c1d3a095b4ff2b6607d096fa80163
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: VYjBrRGzDEV1AJ0XOrgRQNcUhIRQslKmOIqLyZ44kywXmZIP5WvrzY5KB/F7GS3tSjw/nFIcfOauKO/oXHVnpA/DB/1whTXwKhkBrH0GRap61E9zP9R9wOK3GyfA7lJaB6VOG3CmtEZMViT12jGXcgfsxoCyRwu/ClmBYOtQy3DKy32yYPI/fsX8s6FhsNPdr3pWpju37Pi++V8AsJBV+sPAcGixtlVbiBc3xixOV4Q45AA8U88dherTFKT3PvFVZYH3YD1Mq2C2tI1bCYDY4gbRZbUbqKNX1bOeFPcaS7Idk539Yzh9KbOZEumbW77jf8DNWickBiA/GjmxnAtEzKrlBSpjjdA/FxhJOCNaD/X0nfeEjNTizB+JTiYDDMfuCf19ekdIW6EhsTbEGay13aSz53F5O60SiVKjV35xoHYVblatCFnT8NvU3r9+H6KTRHH7ge7WKbd7bsLmpr49s9me6QcRNyAvo0mLB2UsOCqXgvG+AwtfPdZUQfm/wPTFJsY13TMXoN4Hs/ivcVyz98dcwROiYLbSCW/qwgv+aRQqw5W2+9UWCj94xCR8K9Nuw5POsQ2mra4mPFOatr5rk7sD0XyhQYvB8Bw5hQwwmLcXNsR3en2kF9OivA7yuxxOXA4AXdgG1+eEZ4SmtBf31a0nMzkztKV8gOigB8Co26c=
1716
- secure: ogevJljn5n5gDVIUgBpwWBD9gz11XYv0p5DErM4ry3dO0K+P9Z+3heH02Dio12tqCae/c9ZUwAH1ToNTBML+kctkxiEQpXqW4mJLgPJ0Uh9UcWiWR2IN9sQbmX12814EBGV5SQLIHRaAsgZoUETfEmXz7MjA4Ti4V0Q2UkbcEOLglNTVUn9xhh96ohNE9ZMWpX3xNAGKBu2ja/3ZfaM/urNPFMZWHnRjumu2P8J2uuger+mNiaE8o4N0b/iz3J9GbZVc9fzkz2/kHYqr7QhJJ1sMTACFukc/7A9/OrKWV83CTg8ltyYcK7tr4ktWaaW8uWbw40YKx9VRN+ukG/QGKes6hjS7zoMYuJzygiBG9I4CdSIVPu5qNVG7VWAuKmbgshDYmxxqvECO7al7rz531GzcvQjOkt6g3/SPm6OIIKXXWhF8tIMDEnNRMUcjAIrkMDp4qrkHm7B6oDjpWE+Xp+CDLZGhZi7d7G3JPpx83wYEt4+2aRCmXV3raJvqqrjG7sY2wULNMSGiB+u4su11APdQ5WDO+H3XelVhLsbAInMtOaSDmdWtr+mqBxLWirfQQnAoDjdI6DjbFziQ9BfdtnjY2ignlSJTh0UfNUBaSzvkIGitbrCrHu1jVhI4QcME1khidMbmnrJeKNNCRekeiJ6ujnENOTi6jRstazWTp/Q=
1817
- secure: Iq6tftYJEhrxSRdGfM1qtkmtwutn53wBxldlFmOlXmK+A7YzioNZTFngcT2wueErAglofyEE2LsxgBldS0yBGGJWHVx4CjAdg5fzKOxf3aAMVuMj1SXQHon+1YSsEjoyZ8/RYUTnx4bPvzWNhwenpdq2xk0dm3qHdeTr4oAK2xg3r160n+XvOe8AlaerBD7eb5DuzTVHnv16MIBrxz9m0cXXXBvH1eGskK7RGFYlU6D+9cRvHRaV9Wo4bj+mzToxai2fplRbhVxlAUvfeSlBL5Qds0cI6AfmJI9BFligB4uj113m6Uxyprw9CuFvnbSRiyi3EJAQzEaclDzW0GTKxlQ/QJbq1Av+Y+/EentZOmG8jx+vpLQUVZGZBk61znLgvR8scH7Jrehir+aIjKCTXxbfV88h4H27WitGHEDQLSX4l0oZ8LBJNaaNvhli/zXCI8wziKVHdBgWX0l2CDgD7OxK6LjXWP7UqoMUWrUyIN2mq15xjmlDKgFpA09tQ0yE7k++L98YNJdEcoVoxQJ3q80svmlHUa4G0gNEwqSI8o+JRUafTE8r1dbvcGbWVwZ1RTnWo4OY7L61kkWfB5pk9qW32+HLTq0N6FIG/9ieyesfwJn6sWBiLj6waZhYZ+3w/X4mBEdzLRgoHfB0zV6cpfZ2S9PivJpiH4Ny5GLnehI=
@@ -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 $?

maven/maven-wrapper.jar

8.38 KB
Binary file not shown.

maven/maven-wrapper.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
#Wed Mar 23 23:30:00 UTC 2016
2-
distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
1+
#Maven download properties
2+
#Thu Feb 22 06:38:47 UTC 2018
3+
checksumAlgorithm=SHA1
4+
verifyDownload=true
5+
distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip

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.0.31</version>
21+
<version>1.1.4</version>
2222
<relativePath />
2323
</parent>
2424

0 commit comments

Comments
 (0)