You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2017/10/11 14:27:31 UTC
zookeeper git commit: ZOOKEEPER-2915: Use "strict" conflict
management in ivy
Repository: zookeeper
Updated Branches:
refs/heads/branch-3.4 948766de3 -> 541d74b35
ZOOKEEPER-2915: Use "strict" conflict management in ivy
Author: Abraham Fine <af...@apache.org>
Reviewers: Patrick Hunt <ph...@apache.org>
Closes #396 from afine/ZOOKEEPER-2915_3.4
Change-Id: I70d26db1aeac11bf0e1db0388bc0b7cc725a1470
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/541d74b3
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/541d74b3
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/541d74b3
Branch: refs/heads/branch-3.4
Commit: 541d74b350fda47a4cd32a16a742094f1f62ccb1
Parents: 948766d
Author: Abraham Fine <af...@apache.org>
Authored: Wed Oct 11 07:27:14 2017 -0700
Committer: Patrick Hunt <ph...@apache.org>
Committed: Wed Oct 11 07:27:14 2017 -0700
----------------------------------------------------------------------
build.xml | 22 +++++++++++++---------
ivy.xml | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
2 files changed, 55 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/541d74b3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 99a9a16..d2209a6 100644
--- a/build.xml
+++ b/build.xml
@@ -251,33 +251,37 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
</sequential>
</macrodef>
- <!-- the normal classpath -->
- <path id="java.classpath">
+ <path id="base.classpath">
<pathelement location="${build.classes}"/>
<!-- allow the user to override (e.g. if there are local versions) -->
<fileset dir="${additional.lib.dir}">
- <include name="${additional.lib.dir.includes}" />
- <exclude name="${additional.lib.dir.excludes}" />
+ <include name="${additional.lib.dir.includes}" />
+ <exclude name="${additional.lib.dir.excludes}" />
</fileset>
<fileset dir="${lib.dir}">
- <include name="${lib.dir.includes}" />
- <exclude name="${lib.dir.excludes}" />
+ <include name="${lib.dir.includes}" />
+ <exclude name="${lib.dir.excludes}" />
</fileset>
<fileset dir="${ant.home}/lib">
- <include name="ant.jar" />
+ <include name="ant.jar" />
</fileset>
+ <pathelement path="${clover.jar}" />
+ </path>
+
+ <!-- the normal classpath -->
+ <path id="java.classpath">
+ <path refid="base.classpath"/>
<fileset dir="${ivy.lib}">
<include name="**/*.jar" />
</fileset>
- <pathelement path="${clover.jar}" />
</path>
<path id="test.java.classpath">
+ <path refid="base.classpath"/>
<pathelement location="${test.java.classes}" />
<fileset dir="${ivy.test.lib}">
<include name="**/*.jar" />
</fileset>
- <path refid="java.classpath"/>
</path>
<path id="package.classpath">
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/541d74b3/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 8357cf9..152654f 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -28,7 +28,7 @@
<configurations defaultconfmapping="default">
<conf name="master"/>
<conf name="default"/>
- <conf name="test"/>
+ <conf name="test" extends="default"/>
<conf name="mvn-ant-task" visibility="private"/>
<conf name="package" extends="master"/>
<conf name="jdiff" visibility="private"/>
@@ -47,7 +47,10 @@
<dependency org="org.apache.maven.wagon" name="wagon-http" rev="${wagon-http.version}"
conf="mvn-ant-task->default"/>
<dependency org="org.apache.maven" name="maven-ant-tasks" rev="${maven-ant-tasks.version}"
- conf="mvn-ant-task->default"/>
+ conf="mvn-ant-task->default">
+ <exclude org="org.codehaus.plexus" module="plexus-utils"/>
+ <exclude org="org.apache.maven.wagon" module="wagon-provider-api" />
+ </dependency>
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
<dependency org="log4j" name="log4j" rev="${log4j.version}" transitive="false" conf="default"/>
<dependency org="jline" name="jline" rev="${jline.version}" transitive="false" conf="default"/>
@@ -74,7 +77,10 @@
conf="jdiff->default"/>
<dependency org="org.apache.rat" name="apache-rat-tasks"
- rev="${apache-rat-tasks.version}" conf="releaseaudit->default"/>
+ rev="${apache-rat-tasks.version}" conf="releaseaudit->default">
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="commons-lang" module="commons-lang"/>
+ </dependency>
<dependency org="commons-lang" name="commons-lang"
rev="${commons-lang.version}" conf="releaseaudit->default"/>
<dependency org="commons-collections" name="commons-collections"
@@ -88,36 +94,57 @@
<!-- Apache directory server project, org.apache.directory.* packages for miniKdc tests -->
<dependency org="org.apache.directory.server" name="apacheds-core-api" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
+ <exclude org="commons-collections" module="commons-collections"/>
</dependency>
<dependency org="org.apache.directory.server" name="apacheds-interceptor-kerberos" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
<dependency org="org.apache.directory.server" name="apacheds-protocol-shared" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
<dependency org="org.apache.directory.server" name="apacheds-protocol-kerberos" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
<dependency org="org.apache.directory.server" name="apacheds-ldif-partition" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
<dependency org="org.apache.directory.server" name="apacheds-mavibot-partition" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
- <exclude org="org.slf4j" name="slf4j-log4j12"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-log4j12"/>
+ <exclude org="log4j" module="log4j"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
<dependency org="org.apache.directory.api" name="api-all" rev="${apache-directory-api.version}" conf="test->default">
- <exclude org="xml-apis" name="xml-apis"/>
- <exclude org="xpp3" name="xpp3"/>
- <exclude org="dom4j" name="dom4j"/>
+ <exclude org="xml-apis" module="xml-apis"/>
+ <exclude org="xpp3" module="xpp3"/>
+ <exclude org="dom4j" module="dom4j"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
<dependency org="org.apache.directory.server" name="apacheds-jdbm-partition" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
<dependency org="org.apache.directory.server" name="apacheds-protocol-ldap" rev="${apache-directory-server.version}" conf="test->default">
- <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+ <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+ <exclude org="commons-collections" module="commons-collections"/>
+ <exclude org="org.slf4j" module="slf4j-api"/>
</dependency>
+ <conflict manager="strict"/>
+
</dependencies>
</ivy-module>