Skip to content

Commit 27e1356

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Updated against latest snapshots
1 parent ac372e5 commit 27e1356

File tree

58 files changed

+1081
-1007
lines changed

Some content is hidden

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

58 files changed

+1081
-1007
lines changed

‎.github/workflows/maven.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v1
21-
with:
22-
java-version: 1.8
23-
- name: Build with Maven
24-
run: ./scripts/runAcceptanceTests.sh
18+
- uses: actions/checkout@v2
19+
- name: Set up JDK 1.8
20+
uses: actions/setup-java@v1
21+
with:
22+
java-version: 1.8
23+
- name: Build with Maven
24+
run: ./scripts/runAcceptanceTests.sh

‎1128/mvnw

+115-103
Original file line numberDiff line numberDiff line change
@@ -34,129 +34,136 @@
3434
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
3535
# ----------------------------------------------------------------------------
3636

37-
if [ -z "$MAVEN_SKIP_RC" ] ; then
37+
if [ -z "$MAVEN_SKIP_RC" ]; then
3838

39-
if [ -f /etc/mavenrc ] ; then
39+
if [ -f /etc/mavenrc ]; then
4040
. /etc/mavenrc
4141
fi
4242

43-
if [ -f "$HOME/.mavenrc" ] ; then
43+
if [ -f "$HOME/.mavenrc" ]; then
4444
. "$HOME/.mavenrc"
4545
fi
4646

4747
fi
4848

4949
# OS specific support. $var _must_ be set to either true or false.
50-
cygwin=false;
51-
darwin=false;
50+
cygwin=false
51+
darwin=false
5252
mingw=false
53-
case "`uname`" in
54-
CYGWIN*) cygwin=true ;;
55-
MINGW*) mingw=true;;
56-
Darwin*) darwin=true
57-
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58-
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59-
if [ -z "$JAVA_HOME" ]; then
60-
if [ -x "/usr/libexec/java_home" ]; then
61-
export JAVA_HOME="`/usr/libexec/java_home`"
62-
else
63-
export JAVA_HOME="/Library/Java/Home"
64-
fi
53+
case "$(uname)" in
54+
CYGWIN*) cygwin=true ;;
55+
MINGW*) mingw=true ;;
56+
Darwin*)
57+
darwin=true
58+
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
59+
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
60+
if [ -z "$JAVA_HOME" ]; then
61+
if [ -x "/usr/libexec/java_home" ]; then
62+
export JAVA_HOME="$(/usr/libexec/java_home)"
63+
else
64+
export JAVA_HOME="/Library/Java/Home"
6565
fi
66-
;;
66+
fi
67+
;;
6768
esac
6869

69-
if [ -z "$JAVA_HOME" ] ; then
70-
if [ -r /etc/gentoo-release ] ; then
71-
JAVA_HOME=`java-config --jre-home`
70+
if [ -z "$JAVA_HOME" ]; then
71+
if [ -r /etc/gentoo-release ]; then
72+
JAVA_HOME=$(java-config --jre-home)
7273
fi
7374
fi
7475

75-
if [ -z "$M2_HOME" ] ; then
76+
if [ -z "$M2_HOME" ]; then
7677
## resolve links - $0 may be a link to maven's home
7778
PRG="$0"
7879

7980
# need this for relative symlinks
80-
while [ -h "$PRG" ] ; do
81-
ls=`ls -ld "$PRG"`
82-
link=`expr "$ls" : '.*-> \(.*\)$'`
83-
if expr "$link" : '/.*' > /dev/null; then
81+
while [ -h "$PRG" ]; do
82+
ls=$(ls -ld "$PRG")
83+
link=$(expr "$ls" : '.*-> \(.*\)$')
84+
if expr "$link" : '/.*' >/dev/null; then
8485
PRG="$link"
8586
else
86-
PRG="`dirname "$PRG"`/$link"
87+
PRG="$(dirname "$PRG")/$link"
8788
fi
8889
done
8990

90-
saveddir=`pwd`
91+
saveddir=$(pwd)
9192

92-
M2_HOME=`dirname "$PRG"`/..
93+
M2_HOME=$(dirname "$PRG")/..
9394

9495
# make it fully qualified
95-
M2_HOME=`cd "$M2_HOME" && pwd`
96+
M2_HOME=$(cd "$M2_HOME" && pwd)
9697

9798
cd "$saveddir"
9899
# echo Using m2 at $M2_HOME
99100
fi
100101

101102
# For Cygwin, ensure paths are in UNIX format before anything is touched
102-
if $cygwin ; then
103+
if $cygwin; then
103104
[ -n "$M2_HOME" ] &&
104-
M2_HOME=`cygpath --unix "$M2_HOME"`
105+
M2_HOME=$(cygpath --unix "$M2_HOME")
105106
[ -n "$JAVA_HOME" ] &&
106-
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
107+
JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
107108
[ -n "$CLASSPATH" ] &&
108-
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
109+
CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
109110
fi
110111

111112
# For Mingw, ensure paths are in UNIX format before anything is touched
112-
if $mingw ; then
113+
if $mingw; then
113114
[ -n "$M2_HOME" ] &&
114-
M2_HOME="`(cd "$M2_HOME"; pwd)`"
115+
M2_HOME="$( (
116+
cd "$M2_HOME"
117+
pwd
118+
))"
115119
[ -n "$JAVA_HOME" ] &&
116-
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
120+
JAVA_HOME="$( (
121+
cd "$JAVA_HOME"
122+
pwd
123+
))"
117124
# TODO classpath?
118125
fi
119126

120127
if [ -z "$JAVA_HOME" ]; then
121-
javaExecutable="`which javac`"
122-
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
128+
javaExecutable="$(which javac)"
129+
if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then
123130
# readlink(1) is not available as standard on Solaris 10.
124-
readLink=`which readlink`
125-
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
126-
if $darwin ; then
127-
javaHome="`dirname \"$javaExecutable\"`"
128-
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
131+
readLink=$(which readlink)
132+
if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then
133+
if $darwin; then
134+
javaHome="$(dirname \"$javaExecutable\")"
135+
javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac"
129136
else
130-
javaExecutable="`readlink -f \"$javaExecutable\"`"
137+
javaExecutable="$(readlink -f \"$javaExecutable\")"
131138
fi
132-
javaHome="`dirname \"$javaExecutable\"`"
133-
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
139+
javaHome="$(dirname \"$javaExecutable\")"
140+
javaHome=$(expr "$javaHome" : '\(.*\)/bin')
134141
JAVA_HOME="$javaHome"
135142
export JAVA_HOME
136143
fi
137144
fi
138145
fi
139146

140-
if [ -z "$JAVACMD" ] ; then
141-
if [ -n "$JAVA_HOME" ] ; then
142-
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
147+
if [ -z "$JAVACMD" ]; then
148+
if [ -n "$JAVA_HOME" ]; then
149+
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
143150
# IBM's JDK on AIX uses strange locations for the executables
144151
JAVACMD="$JAVA_HOME/jre/sh/java"
145152
else
146153
JAVACMD="$JAVA_HOME/bin/java"
147154
fi
148155
else
149-
JAVACMD="`which java`"
156+
JAVACMD="$(which java)"
150157
fi
151158
fi
152159

153-
if [ ! -x "$JAVACMD" ] ; then
160+
if [ ! -x "$JAVACMD" ]; then
154161
echo "Error: JAVA_HOME is not defined correctly." >&2
155162
echo " We cannot execute $JAVACMD" >&2
156163
exit 1
157164
fi
158165

159-
if [ -z "$JAVA_HOME" ] ; then
166+
if [ -z "$JAVA_HOME" ]; then
160167
echo "Warning: JAVA_HOME environment variable is not set."
161168
fi
162169

@@ -166,22 +173,24 @@ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
166173
# first directory with .mvn subdirectory is considered project base directory
167174
find_maven_basedir() {
168175

169-
if [ -z "$1" ]
170-
then
176+
if [ -z "$1" ]; then
171177
echo "Path not specified to find_maven_basedir"
172178
return 1
173179
fi
174180

175181
basedir="$1"
176182
wdir="$1"
177-
while [ "$wdir" != '/' ] ; do
178-
if [ -d "$wdir"/.mvn ] ; then
183+
while [ "$wdir" != '/' ]; do
184+
if [ -d "$wdir"/.mvn ]; then
179185
basedir=$wdir
180186
break
181187
fi
182188
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
183189
if [ -d "${wdir}" ]; then
184-
wdir=`cd "$wdir/.."; pwd`
190+
wdir=$(
191+
cd "$wdir/.."
192+
pwd
193+
)
185194
fi
186195
# end of workaround
187196
done
@@ -191,69 +200,72 @@ find_maven_basedir() {
191200
# concatenates all lines of a file
192201
concat_lines() {
193202
if [ -f "$1" ]; then
194-
echo "$(tr -s '\n' ' ' < "$1")"
203+
echo "$(tr -s '\n' ' ' <"$1")"
195204
fi
196205
}
197206

198-
BASE_DIR=`find_maven_basedir "$(pwd)"`
207+
BASE_DIR=$(find_maven_basedir "$(pwd)")
199208
if [ -z "$BASE_DIR" ]; then
200-
exit 1;
209+
exit 1
201210
fi
202211

203212
##########################################################################################
204213
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
205214
# This allows using the maven wrapper in projects that prohibit checking in binary data.
206215
##########################################################################################
207216
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
217+
if [ "$MVNW_VERBOSE" = true ]; then
218+
echo "Found .mvn/wrapper/maven-wrapper.jar"
219+
fi
220+
else
221+
if [ "$MVNW_VERBOSE" = true ]; then
222+
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
223+
fi
224+
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
225+
while IFS="=" read key value; do
226+
case "$key" in wrapperUrl)
227+
jarUrl="$value"
228+
break
229+
;;
230+
esac
231+
done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
232+
if [ "$MVNW_VERBOSE" = true ]; then
233+
echo "Downloading from: $jarUrl"
234+
fi
235+
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
236+
237+
if command -v wget >/dev/null; then
208238
if [ "$MVNW_VERBOSE" = true ]; then
209-
echo "Found .mvn/wrapper/maven-wrapper.jar"
239+
echo "Found wget ... using wget"
210240
fi
211-
else
241+
wget "$jarUrl" -O "$wrapperJarPath"
242+
elif command -v curl >/dev/null; then
212243
if [ "$MVNW_VERBOSE" = true ]; then
213-
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
244+
echo "Found curl ... using curl"
214245
fi
215-
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
216-
while IFS="=" read key value; do
217-
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
218-
esac
219-
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
246+
curl -o "$wrapperJarPath" "$jarUrl"
247+
else
220248
if [ "$MVNW_VERBOSE" = true ]; then
221-
echo "Downloading from: $jarUrl"
249+
echo "Falling back to using Java to download"
222250
fi
223-
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
224-
225-
if command -v wget > /dev/null; then
226-
if [ "$MVNW_VERBOSE" = true ]; then
227-
echo "Found wget ... using wget"
228-
fi
229-
wget "$jarUrl" -O "$wrapperJarPath"
230-
elif command -v curl > /dev/null; then
251+
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
252+
if [ -e "$javaClass" ]; then
253+
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
231254
if [ "$MVNW_VERBOSE" = true ]; then
232-
echo "Found curl ... using curl"
255+
echo " - Compiling MavenWrapperDownloader.java ..."
233256
fi
234-
curl -o "$wrapperJarPath" "$jarUrl"
235-
else
257+
# Compiling the Java class
258+
("$JAVA_HOME/bin/javac" "$javaClass")
259+
fi
260+
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
261+
# Running the downloader
236262
if [ "$MVNW_VERBOSE" = true ]; then
237-
echo "Falling back to using Java to download"
238-
fi
239-
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
240-
if [ -e "$javaClass" ]; then
241-
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
242-
if [ "$MVNW_VERBOSE" = true ]; then
243-
echo " - Compiling MavenWrapperDownloader.java ..."
244-
fi
245-
# Compiling the Java class
246-
("$JAVA_HOME/bin/javac" "$javaClass")
247-
fi
248-
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
249-
# Running the downloader
250-
if [ "$MVNW_VERBOSE" = true ]; then
251-
echo " - Running MavenWrapperDownloader.java ..."
252-
fi
253-
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
254-
fi
263+
echo " - Running MavenWrapperDownloader.java ..."
255264
fi
265+
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
266+
fi
256267
fi
268+
fi
257269
fi
258270
##########################################################################################
259271
# End of extension
@@ -268,13 +280,13 @@ MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
268280
# For Cygwin, switch paths to Windows format before running java
269281
if $cygwin; then
270282
[ -n "$M2_HOME" ] &&
271-
M2_HOME=`cygpath --path --windows "$M2_HOME"`
283+
M2_HOME=$(cygpath --path --windows "$M2_HOME")
272284
[ -n "$JAVA_HOME" ] &&
273-
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
285+
JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
274286
[ -n "$CLASSPATH" ] &&
275-
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
287+
CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
276288
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
277-
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
289+
MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
278290
fi
279291

280292
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

‎1128/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>com.example</groupId>
@@ -32,7 +32,11 @@
3232
</dependency>
3333
<dependency>
3434
<groupId>org.springframework.cloud</groupId>
35-
<artifactId>spring-cloud-starter-zipkin</artifactId>
35+
<artifactId>spring-cloud-starter-sleuth</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.springframework.cloud</groupId>
39+
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
3640
</dependency>
3741

3842
<dependency>

0 commit comments

Comments
 (0)