Repository: incubator-htrace Updated Branches: refs/heads/4.0 4e110718b -> 5c041bc2d
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/5c041bc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/5c041bc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/5c041bc2 Branch: refs/heads/4.0 Commit: 5c041bc2d2ed331537d7809d9f3f81eb7778758e Parents: 4e11071 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:05:23 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/5c041bc2/htrace-flume/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml index 8dc3f4e..52a4087 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/5c041bc2/htrace-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml index b8e8bab..213c61f 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> @@ -163,7 +163,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/5c041bc2/htrace-htraced/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml index 8fb274c..9d010fe 100644 --- a/htrace-htraced/pom.xml +++ b/htrace-htraced/pom.xml @@ -168,13 +168,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/5c041bc2/htrace-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-webapp/pom.xml b/htrace-webapp/pom.xml index 1963710..e2ab39a 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/5c041bc2/htrace-zipkin/pom.xml ---------------------------------------------------------------------- diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml index 92be928..3a8355a 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>
