apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

debian: Fix package building with Maven

Browse Source 
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.
This commit is contained in:
Wido den Hollander 2012-09-07 00:42:07 +02:00
parent 1eaca390b9
commit 44f1a8e015
5 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/cloud-agent-deps.install vendored
View File

@ -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

1
debian/cloud-client.install vendored
View File

@ -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

48
debian/cloud-deps.install vendored
View File

@ -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

5
debian/cloud-server.install vendored
View File

@ -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

2
wscript_build
View File

@ -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)