You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by st...@apache.org on 2015/09/16 22:19:30 UTC
incubator-htrace git commit: HTRACE-251 Fix "mvn clean" target
Repository: incubator-htrace
Updated Branches:
refs/heads/master f9343e912 -> e00dc0ef2
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/e00dc0ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/e00dc0ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/e00dc0ef
Branch: refs/heads/master
Commit: e00dc0ef2e33f6c2b33c9847e5fb8972df225761
Parents: f9343e9
Author: stack <st...@duboce.net>
Authored: Wed Sep 16 13:19:21 2015 -0700
Committer: stack <st...@duboce.net>
Committed: Wed Sep 16 13:19:21 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/e00dc0ef/htrace-htraced/go/gobuild.sh
----------------------------------------------------------------------
diff --git a/htrace-htraced/go/gobuild.sh b/htrace-htraced/go/gobuild.sh
index e627147..f23c639 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/e00dc0ef/htrace-htraced/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml
index 16d2206..87ad4a5 100644
--- a/htrace-htraced/pom.xml
+++ b/htrace-htraced/pom.xml
@@ -127,19 +127,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>
@@ -150,6 +142,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/e00dc0ef/htrace-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-webapp/pom.xml b/htrace-webapp/pom.xml
index dc1a05c..a291cd4 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/webapp/WEB-INF/web.xml</webXml>
</configuration>