You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/09/07 02:24:06 UTC
git commit: debian: Fix package building with Maven
Updated Branches:
refs/heads/master 1eaca390b -> 44f1a8e01
debian: Fix package building with Maven
This involves removing a couple of JAR files from these packages:
* cloud-deps
* cloud-agent-deps
* cloud-client
A couple of libraries no longer have the cloud-* prefix or go renamed otherwise.
We no longer include the following libraries:
* netscaler
* iControl
* manageontap
* jnetpcap
* junit
* jetty
* vmware
* xenserver
These are not required anymore or not allowed license wise.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/44f1a8e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/44f1a8e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/44f1a8e0
Branch: refs/heads/master
Commit: 44f1a8e0159bf680f0bdd0775ee016d429a29762
Parents: 1eaca39
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Sep 7 00:42:07 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Sep 7 02:17:16 2012 +0200
----------------------------------------------------------------------
debian/cloud-agent-deps.install | 3 +-
debian/cloud-client.install | 1 -
debian/cloud-deps.install | 48 +++++++++++++--------------------
debian/cloud-server.install | 5 ---
wscript_build | 2 +-
5 files changed, 21 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/44f1a8e0/debian/cloud-agent-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-agent-deps.install b/debian/cloud-agent-deps.install
index d980d23..da90a30 100644
--- a/debian/cloud-agent-deps.install
+++ b/debian/cloud-agent-deps.install
@@ -15,6 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-/usr/share/java/cloud-google-gson-1.7.1.jar
+/usr/share/java/gson-1.7.1.jar
/usr/share/java/libvirt-0.4.8.jar
-/usr/share/java/cloud-log4j-extras.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/44f1a8e0/debian/cloud-client.install
----------------------------------------------------------------------
diff --git a/debian/cloud-client.install b/debian/cloud-client.install
index 0d4f809..aadb145 100644
--- a/debian/cloud-client.install
+++ b/debian/cloud-client.install
@@ -55,5 +55,4 @@
/var/lib/cloud/management
/usr/bin/cloud-setup-management
/usr/bin/cloud-update-xenserver-licenses
-/usr/share/java/cloud-vmware-base.jar
/etc/cloud/management/commands-ext.properties
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/44f1a8e0/debian/cloud-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index e6ddde5..5b11d63 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -15,32 +15,22 @@
# specific language governing permissions and limitations
# under the License.
-/usr/share/java/cloud-commons-codec-1.5.jar
-/usr/share/java/cloud-commons-dbcp-1.4.jar
-/usr/share/java/cloud-commons-pool-1.5.6.jar
-/usr/share/java/cloud-netscaler.jar
-/usr/share/java/cloud-netscaler-sdx.jar
-/usr/share/java/cloud-backport-util-concurrent-3.0.jar
-/usr/share/java/cloud-ehcache.jar
-/usr/share/java/cloud-email.jar
-/usr/share/java/cloud-httpcore-4.0.jar
-/usr/share/java/cloud-log4j.jar
-/usr/share/java/cloud-trilead-ssh2-build213.jar
-/usr/share/java/cloud-cglib.jar
-/usr/share/java/cloud-xenserver-5.6.100-1.jar
-/usr/share/java/cloud-xmlrpc-common-3.*.jar
-/usr/share/java/cloud-xmlrpc-client-3.*.jar
-/usr/share/java/cloud-jstl-1.2.jar
-/usr/share/java/cloud-axis.jar
-/usr/share/java/cloud-commons-discovery.jar
-/usr/share/java/cloud-wsdl4j-1.6.2.jar
-/usr/share/java/cloud-bcprov-jdk16-1.45.jar
-/usr/share/java/cloud-jsch-0.1.42.jar
-/usr/share/java/cloud-iControl.jar
-/usr/share/java/cloud-manageontap.jar
-/usr/share/java/cloud-jnetpcap.jar
-/usr/share/java/cloud-junit.jar
-/usr/share/java/cloud-jasypt-1.8.jar
-/usr/share/java/jetty-6.1.26.jar
-/usr/share/java/jetty-util-6.1.26.jar
-/usr/share/java/vmware*.jar
+/usr/share/java/commons-codec-1.6.jar
+/usr/share/java/commons-dbcp-1.4.jar
+/usr/share/java/commons-pool-1.6.jar
+/usr/share/java/backport-util-concurrent-3.1.jar
+/usr/share/java/ehcache-1.5.0.jar
+/usr/share/java/mail-1.4.jar
+/usr/share/java/httpcore-4.0.jar
+/usr/share/java/log4j-*.jar
+/usr/share/java/trilead-ssh2-build213-svnkit-1.3-patch.jar
+/usr/share/java/cglib-2.2.jar
+/usr/share/java/xmlrpc-common-3.*.jar
+/usr/share/java/xmlrpc-client-3.*.jar
+/usr/share/java/jstl-1.2.jar
+/usr/share/java/axis2-1.5.1.jar
+/usr/share/java/commons-discovery-0.5.jar
+/usr/share/java/wsdl4j-1.6.2.jar
+/usr/share/java/bcprov-jdk16-1.46.jar
+/usr/share/java/jsch-0.1.42.jar
+/usr/share/java/jasypt-1.*.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/44f1a8e0/debian/cloud-server.install
----------------------------------------------------------------------
diff --git a/debian/cloud-server.install b/debian/cloud-server.install
index 711d928..76849f0 100644
--- a/debian/cloud-server.install
+++ b/debian/cloud-server.install
@@ -22,15 +22,10 @@
/usr/share/java/cloud-dp-user-dispersing.jar
/usr/share/java/cloud-host-allocator-random.jar
/usr/share/java/cloud-plugin-elb.jar
-/usr/share/java/cloud-plugin-f5.jar
-/usr/share/java/cloud-plugin-netapp.jar
-/usr/share/java/cloud-plugin-netscaler.jar
/usr/share/java/cloud-plugin-ovs.jar
-/usr/share/java/cloud-plugin-srx.jar
/usr/share/java/cloud-plugin-nicira-nvp.jar
/usr/share/java/cloud-storage-allocator-random.jar
/usr/share/java/cloud-user-authenticator-ldap.jar
/usr/share/java/cloud-user-authenticator-md5.jar
/usr/share/java/cloud-user-authenticator-plaintext.jar
/usr/share/java/cloud-xen.jar
-/usr/share/java/cloud-vmware.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/44f1a8e0/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index e4d703a..9bb645b 100644
--- a/wscript_build
+++ b/wscript_build
@@ -162,7 +162,7 @@ def build_dependences ():
start_path = bld.path.find_dir ("deps")
- bld.install_files('${JAVADIR}',start_path.ant_glob(["libvirt-0.4.8.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",
+ bld.install_files('${JAVADIR}',start_path.ant_glob(["libvirt-0.4.8.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-2.2.jar", "xmlrpc-common-3.*.jar",
"xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar", "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "hibernate-jpa-2.0-api-1.0.0.Final.jar", "hibernate-entitymanager-3.5.1-Final.jar", "hibernate-core-3.5.1-Final.jar", "hibernate-commons-annotations-3.2.0.Final.jar", "hibernate-annotations-3.5.1-Final.jar", "asm-3.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)