Skip to content

Commit 92ededa

Browse files
committed
Updates from review
1 parent b258a66 commit 92ededa

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

contrib/datawave-quickstart/bin/common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function downloadMavenTarball() {
136136
tarball="${artifact}-${version}.tar.gz"
137137
if [ ! -f "${tarballdir}/${tarball}" ] ; then
138138
# download from maven repo
139-
output=$( mvn -f "${pomFile}" -pl "${rootProject}" -DremoteRepositories="remote-repo::default::${DW_MAVEN_REPOSITORY}" dependency:get -Dartifact="${group}:${artifact}:${version}" -Dpackaging="tar.gz" )
139+
output=$( mvn --show-version --batch-mode --errors --no-transfer-progress --file "${pomFile}" --projects "${rootProject}" -DremoteRepositories="remote-repo::default::${DW_MAVEN_REPOSITORY}" dependency:get -Dartifact="${group}:${artifact}:${version}" -Dpackaging="tar.gz" )
140140
retVal=$?
141141
if [ $retVal -ne 0 ]; then
142142
error "Failed to download ${tarball} via maven"
@@ -147,7 +147,7 @@ function downloadMavenTarball() {
147147
fi
148148

149149
# copy to specified directory
150-
output=$( mvn -f "${pomFile}" -pl "${rootProject}" dependency:copy -Dartifact="${group}:${artifact}:${version}:tar.gz" -DoutputDirectory="${tarballdir}" )
150+
output=$( mvn --show-version --batch-mode --errors --no-transfer-progress --file "${pomFile}" --projects "${rootProject}" dependency:copy -Dartifact="${group}:${artifact}:${version}:tar.gz" -DoutputDirectory="${tarballdir}" )
151151
retVal=$?
152152
if [ $retVal -ne 0 ]; then
153153
error "Failed to copy ${tarball} to ${tarballdir} via maven"

contrib/datawave-quickstart/docker/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<url.zookeeper>file://${DW_CLOUD_PLUGINS}/accumulo/${dist.zookeeper}</url.zookeeper>
3232

3333
<version.quickstart.accumulo>2.1.4-5792fed3-bulkv2</version.quickstart.accumulo>
34-
<version.quickstart.hadoop>3.3.6</version.quickstart.hadoop>
35-
<version.quickstart.wildfly>17.0.1</version.quickstart.wildfly>
36-
<version.quickstart.zookeeper>3.8.4</version.quickstart.zookeeper>
34+
<version.quickstart.hadoop>${version.hadoop}</version.quickstart.hadoop>
35+
<version.quickstart.wildfly>${version.wildfly}</version.quickstart.wildfly>
36+
<version.quickstart.zookeeper>${version.zookeeper}</version.quickstart.zookeeper>
3737

3838
</properties>
3939
<dependencies>

microservices/starters/datawave/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -399,20 +399,6 @@
399399
</exclusion>
400400
</exclusions>
401401
</dependency>
402-
<dependency>
403-
<groupId>org.springframework.boot</groupId>
404-
<artifactId>spring-boot-starter-web</artifactId>
405-
<exclusions>
406-
<exclusion>
407-
<groupId>org.springframework.boot</groupId>
408-
<artifactId>spring-boot-starter-logging</artifactId>
409-
</exclusion>
410-
<exclusion>
411-
<groupId>org.springframework.boot</groupId>
412-
<artifactId>spring-boot-starter-tomcat</artifactId>
413-
</exclusion>
414-
</exclusions>
415-
</dependency>
416402
<dependency>
417403
<groupId>org.springframework.cloud</groupId>
418404
<artifactId>spring-cloud-config-client</artifactId>

0 commit comments

Comments
 (0)