Repository: incubator-htrace Updated Branches: refs/heads/master e20cb1ddb -> 5abf6b8e3
HTRACE-17. pom.xml cleanups (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/5abf6b8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/5abf6b8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/5abf6b8e Branch: refs/heads/master Commit: 5abf6b8e3da956834c6c37353ad142fc72ebe4f5 Parents: e20cb1d Author: Colin P. Mccabe <[email protected]> Authored: Thu Dec 11 23:44:09 2014 -0800 Committer: Colin P. Mccabe <[email protected]> Committed: Fri Dec 12 13:01:45 2014 -0800 ---------------------------------------------------------------------- htrace-core/pom.xml | 24 +++++++++++------------- htrace-hbase/pom.xml | 4 ++-- htrace-zipkin/pom.xml | 2 +- pom.xml | 9 +++++---- 4 files changed, 19 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/5abf6b8e/htrace-core/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml index 28d772e..cf4942c 100644 --- a/htrace-core/pom.xml +++ b/htrace-core/pom.xml @@ -22,7 +22,7 @@ language governing permissions and limitations under the License. --> </parent> <name>htrace-core</name> - <url>https://github.com/cloudera/htrace</url> + <url>http://incubator.apache.org/projects/htrace.html</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -49,8 +49,8 @@ language governing permissions and limitations under the License. --> <configuration> <relocations> <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>org.apache.htrace.google.common</shadedPattern> + <pattern>org.apache.commons.logging</pattern> + <shadedPattern>org.apache.htrace.commons.logging</shadedPattern> </relocation> <relocation> <pattern>org.mortbay</pattern> @@ -79,7 +79,6 @@ language governing permissions and limitations under the License. --> failonerror="true"> </exec> </tasks> - <goals>run</goals> </configuration> </execution> <execution> @@ -88,13 +87,12 @@ language governing permissions and limitations under the License. --> <goals><goal>run</goal></goals> <configuration> <tasks> - <exec executable="./gobuild.sh" - dir="${basedir}/src/go/" - failonerror="true"> - <arg value="test"/> + <exec executable="bash" failonerror="true" dir="${basedir}/src/go"> + <arg value="-c"/> + <arg value="[ x$SKIPTESTS = xtrue ] || ./gobuild.sh test"/> + <env key="SKIPTESTS" value="${skipTests}"/> </exec> </tasks> - <goals>run</goals> </configuration> </execution> </executions> @@ -121,16 +119,16 @@ language governing permissions and limitations under the License. --> <dependencies> <!-- Global deps. --> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <!-- core specific deps. --> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId> <version>6.1.26</version> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/5abf6b8e/htrace-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml index bff6b81..2ff26aa 100644 --- a/htrace-hbase/pom.xml +++ b/htrace-hbase/pom.xml @@ -24,9 +24,9 @@ language governing permissions and limitations under the License. --> <name>htrace-hbase</name> <description> htrace-hbase is the tools to send tracing information - to a HBase database for analysis later. + to an HBase database for analysis later. </description> - <url>https://github.com/cloudera/htrace</url> + <url>http://incubator.apache.org/projects/htrace.html</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/5abf6b8e/htrace-zipkin/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml index e34c1cc..e43fed4 100644 --- a/htrace-zipkin/pom.xml +++ b/htrace-zipkin/pom.xml @@ -22,7 +22,7 @@ language governing permissions and limitations under the License. --> </parent> <name>htrace-zipkin</name> - <url>https://github.com/cloudera/htrace</url> + <url>http://incubator.apache.org/projects/htrace.html</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/5abf6b8e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b14c6b8..a64d2f8 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ language governing permissions and limitations under the License. --> </developer> </developers> - <url>https://github.com/cloudera/htrace</url> + <url>http://incubator.apache.org/projects/htrace.html</url> <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -61,9 +61,9 @@ language governing permissions and limitations under the License. --> </license> </licenses> <scm> - <connection>scm:git:[email protected]:cloudera/htrace.git</connection> - <developerConnection>scm:git:[email protected]:cloudera/htrace.git</developerConnection> - <url>scm:git:[email protected]:cloudera/htrace.git</url> + <connection>scm:git:https://incubator.apache.org/projects/htrace.html</connection> + <developerConnection>scm:git:https://incubator.apache.org/projects/htrace.html</developerConnection> + <url>scm:git:https://incubator.apache.org/projects/htrace.html</url> </scm> <build> <pluginManagement> @@ -200,6 +200,7 @@ language governing permissions and limitations under the License. --> </build> <properties> <targetJdk>1.6</targetJdk> + <failIfNoTests>false</failIfNoTests> </properties> <dependencyManagement> <dependencies>
