Skip to content

Commit

Permalink
[GEOS-10871] Use dependency management for antrun version 3.1.0
Browse files Browse the repository at this point in the history
Some community modules use of antrun updated from tasks to target
  • Loading branch information
jodygarnett authored and pmauduit committed Feb 28, 2023
1 parent c8425c0 commit 9c06a6e
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion doc/en/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@
<!-- documentation build -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
Expand Down
8 changes: 4 additions & 4 deletions doc/zhCN/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<id>version</id>
<phase>process-resources</phase>
<configuration>
<tasks>
<target>
<copy file="../en/release/VERSION.txt" todir="target" filtering="true">
<filterset begintoken="$${" endtoken="}">
<filter token="project.version" value="${project.version}"/>
Expand All @@ -51,7 +51,7 @@
<filter token="build.hudsonId" value="${build.hudsonId}"/>
</filterset>
</copy>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand All @@ -61,12 +61,12 @@
<id>sphinx</id>
<phase>compile</phase>
<configuration>
<tasks>
<target>
<ant antfile="build.xml" dir="${basedir}" target="${target}">
<property name="build.directory" value="${project.build.directory}"/>
<property name="project.version" value="${project.version}"/>
</ant>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand Down
1 change: 0 additions & 1 deletion src/community/netcdf-ghrsst/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>process-resources</id>
Expand Down
1 change: 0 additions & 1 deletion src/community/release/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>install</phase>
Expand Down
5 changes: 4 additions & 1 deletion src/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1667,6 +1667,10 @@
<pluginManagement>
<plugins>
<!-- core org.apache.maven.plugins -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.2.0</version>
Expand Down Expand Up @@ -2280,7 +2284,6 @@

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>read-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion src/release/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>remove-dependencies</id>
Expand Down
1 change: 0 additions & 1 deletion src/web/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@
<!-- Builds a valid data directory into the web app -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>configPackage</id>
Expand Down
1 change: 0 additions & 1 deletion src/web/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>process-resources</id>
Expand Down

0 comments on commit 9c06a6e

Please sign in to comment.