Repository: incubator-htrace Updated Branches: refs/heads/4.0 8cf1e0196 -> 206daf9d5
HTRACE-251 Fix "mvn clean" target Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/206daf9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/206daf9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/206daf9d Branch: refs/heads/4.0 Commit: 206daf9d5a5c94dfaafc064c45bb1d31f21f29a9 Parents: 8cf1e01 Author: stack <[email protected]> Authored: Wed Sep 16 13:19:21 2015 -0700 Committer: stack <[email protected]> Committed: Fri Sep 18 12:52:54 2015 -0700 ---------------------------------------------------------------------- htrace-htraced/go/gobuild.sh | 2 ++ htrace-htraced/pom.xml | 25 ++++++++++++------------- htrace-webapp/pom.xml | 1 + 3 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/206daf9d/htrace-htraced/go/gobuild.sh ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/gobuild.sh b/htrace-htraced/go/gobuild.sh index a614ef4..eb10e9e 100755 --- a/htrace-htraced/go/gobuild.sh +++ b/htrace-htraced/go/gobuild.sh @@ -101,6 +101,8 @@ else fi case $ACTION in + # Add any directory you want to clean up into the pom too. We cannot run + # this gobuild clean from mvn. clean) rm -rf -- "${GOBIN}" ${SCRIPT_DIR}/pkg ;; http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/206daf9d/htrace-htraced/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml index 21eef6c..8fb274c 100644 --- a/htrace-htraced/pom.xml +++ b/htrace-htraced/pom.xml @@ -132,19 +132,11 @@ language governing permissions and limitations under the License. --> </tasks> </configuration> </execution> - <execution> - <phase>clean</phase> - <id>go_clean</id> - <goals><goal>run</goal></goals> - <configuration> - <tasks> - <exec executable="bash" failonerror="true" dir="${basedir}/go"> - <arg value="-c"/> - <arg value="./gobuild.sh clean"/> - </exec> - </tasks> - </configuration> - </execution> + <!--We used to call go/gobuild.sh clean here but it fails if + the first thing we do is mvn clean because this plugin + expects all plugins to be in place. Instead use the + below maven-clean-plugin to clean out any extra go dirs. + --> </executions> </plugin> <plugin> @@ -155,6 +147,13 @@ language governing permissions and limitations under the License. --> <fileset> <directory>bin</directory> </fileset> + <!--Below dirs must match what gobuild.sh clean does.--> + <fileset> + <directory>go/build</directory> + </fileset> + <fileset> + <directory>go/pkg</directory> + </fileset> </filesets> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/206daf9d/htrace-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-webapp/pom.xml b/htrace-webapp/pom.xml index e0b521b..74dd3d7 100644 --- a/htrace-webapp/pom.xml +++ b/htrace-webapp/pom.xml @@ -31,6 +31,7 @@ language governing permissions and limitations under the License. --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>${maven-war-plugin.version}</version> <configuration> <webXml>src/main/web/WEB-INF/web.xml</webXml> </configuration>
