Updated Branches: refs/heads/network-refactor 5fc8c336b -> de57cff3c
Revert "add java-ipv6 as deps in rpm build" This reverts commit 5fc8c336bb74ff08ad4184f1ddf70452a647b504. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/de57cff3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/de57cff3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/de57cff3 Branch: refs/heads/network-refactor Commit: de57cff3c574bf83829f7f7a823bf7347d3bda4d Parents: 5fc8c33 Author: Sheng Yang <sheng.y...@citrix.com> Authored: Fri Mar 15 16:08:40 2013 -0700 Committer: Sheng Yang <sheng.y...@citrix.com> Committed: Fri Mar 15 16:08:40 2013 -0700 ---------------------------------------------------------------------- cloud.spec | 1 - wscript_build | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/de57cff3/cloud.spec ---------------------------------------------------------------------- diff --git a/cloud.spec b/cloud.spec index 2fb1812..9f46dd6 100644 --- a/cloud.spec +++ b/cloud.spec @@ -502,7 +502,6 @@ fi %{_javadir}/jstl-1.2.jar %{_javadir}/javax.persistence-2.0.0.jar %{_javadir}/bcprov-jdk16-1.45.jar -%{_javadir}/java-ipv6*.jar %doc LICENSE %doc NOTICE http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/de57cff3/wscript_build ---------------------------------------------------------------------- diff --git a/wscript_build b/wscript_build index 2dfcd29..1c12c61 100644 --- a/wscript_build +++ b/wscript_build @@ -165,7 +165,7 @@ def build_dependences (): bld.install_files('${JAVADIR}',start_path.ant_glob(["CAStorSDK-*.jar", "javax.persistence-2.0.0.jar", "apache-log4j-extras-1.1.jar", "libvirt-0.4.9.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar", "netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar", "axiom*.jar", "axis2*.jar", "antlr*.jar", "XmlSchema*.jar", "json-simple*.jar", "neethi*.jar", "woden*.jar", "xercesImpl*.jar", "xml-apis*.jar", "dom4j*.jar", "javassist*.jar", "commons-fileupload*.jar", - "java-ipv6*.jar", "xmlrpc-client-3.*.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.45.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "mail-1.4.jar", "activation-1.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path) + "xmlrpc-client-3.*.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.45.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "mail-1.4.jar", "activation-1.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path) #def build_console_proxy (): # binary unsubstitutable files:
