Repository: incubator-htrace Updated Branches: refs/heads/master e63f2c1ff -> b48480920
HTRACE-256 addendum. Subprojects must rely on htrace-core4, not htrace-core Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/b4848092 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/b4848092 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/b4848092 Branch: refs/heads/master Commit: b484809209edc3ea5d8ce3eacead57ee0898a5c5 Parents: e63f2c1 Author: Colin P. Mccabe <[email protected]> Authored: Fri Sep 18 15:03:47 2015 -0700 Committer: Colin P. Mccabe <[email protected]> Committed: Fri Sep 18 15:03:47 2015 -0700 ---------------------------------------------------------------------- htrace-flume/pom.xml | 4 ++-- htrace-hbase/pom.xml | 6 +++--- htrace-htraced/pom.xml | 4 ++-- htrace-webapp/pom.xml | 4 ++-- htrace-zipkin/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/b4848092/htrace-flume/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml index 283f62a..b4e19f6 100644 --- a/htrace-flume/pom.xml +++ b/htrace-flume/pom.xml @@ -70,13 +70,13 @@ language governing permissions and limitations under the License. --> <!-- Module deps. --> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/b4848092/htrace-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml index 89db195..fc8b188 100644 --- a/htrace-hbase/pom.xml +++ b/htrace-hbase/pom.xml @@ -118,13 +118,13 @@ language governing permissions and limitations under the License. --> <!-- Module deps. --> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> @@ -170,7 +170,7 @@ language governing permissions and limitations under the License. --> <exclusions> <exclusion> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/b4848092/htrace-htraced/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml index 87ad4a5..685a7af 100644 --- a/htrace-htraced/pom.xml +++ b/htrace-htraced/pom.xml @@ -163,13 +163,13 @@ language governing permissions and limitations under the License. --> <!-- Module deps. --> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/b4848092/htrace-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-webapp/pom.xml b/htrace-webapp/pom.xml index a291cd4..3fc3e5b 100644 --- a/htrace-webapp/pom.xml +++ b/htrace-webapp/pom.xml @@ -73,13 +73,13 @@ language governing permissions and limitations under the License. --> <!-- Module deps. --> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/b4848092/htrace-zipkin/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml index d1b0287..8e2c8a1 100644 --- a/htrace-zipkin/pom.xml +++ b/htrace-zipkin/pom.xml @@ -109,12 +109,12 @@ language governing permissions and limitations under the License. --> <!-- Module deps. --> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> + <artifactId>htrace-core4</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
