summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2023-08-29 11:17:48 +0200
committerGitHub <noreply@github.com>2023-08-29 11:17:48 +0200
commiteb72c809f9ef74d8e300f21321486e8fe4f6b527 (patch)
treeeb19171392cd043b248028196e44cffc932a53b6
parenta42035a3325890d63ac8dd1526d012f093f1fc90 (diff)
parent6335740f850dcb4e2e134495637fb9818b3db329 (diff)
Merge pull request #28233 from vespa-engine/renovate/org.apache.maven.plugins-maven-antrun-plugin-3.x
Update dependency org.apache.maven.plugins:maven-antrun-plugin to v3
-rw-r--r--hosted-tenant-base/pom.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index e528439c1de..4a3784497b2 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -333,8 +333,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <!-- TODO: fix configuration to allow 3.x of maven-antrun-plugin -->
- <version>1.8</version>
+ <version>${maven-antrun-plugin.vespa.version}</version>
<executions>
<execution>
<id>attach-artifact</id>
@@ -343,7 +342,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<!-- Workaround to copy src/test/application/tests only when its parents exists:
Copy in two steps, eliminating the parents in the helper step-->
@@ -365,7 +364,7 @@
</copy>
<zip destfile="target/application-test.zip" basedir="target/application-test/" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>