Commit Graph

12 Commits

Author SHA1 Message Date
Wido den Hollander c446c459b9 debian: Depend on antlr from the Ubuntu repositories for AWS API
The antlr JAR files conflict with the Ubuntu packages for this JAR files.

Maven depends on this as well, so when you try to install cloud-awsapi on a system
with Maven installed, you get:

(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
 trying to overwrite '/usr/share/java/antlr-2.7.7.jar', which is also in package libantlr-java 2.7.7+dfsg-3
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
 cloud-awsapi_4.0.0-incubating_amd64.deb

antlr-2.7.7.jar is in classpath.conf, so we can depend on this package and it will be loaded
for AWS API
2012-10-10 17:01:17 +02:00
Wido den Hollander 38dca7c9c3 debian: Depend on libcommons-fileupload-java for AWS API
This JAR is also provided by a Ubuntu package and is the version we depend on with Maven.

By adding this JAR to wscript_configure it is added to the classpath so the AWS API will be able to use it.

Not having this will result in a conflict in a package conflict

During build time we will build against the version fetched by Maven, but runtime we will use the one from
the Ubuntu repository.
2012-10-10 14:54:05 +02:00
Wido den Hollander e2288ad518 debian: Depend on dom4j from Ubuntu repository for AWS API
On my system I already had libdom4j-java installed and this lead to:

(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from .../cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing ../cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
 trying to overwrite '/usr/share/java/dom4j-1.6.1.jar', which is also in package libdom4j-java 1.6.1+dfsg.2-5
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
 ../cloud-awsapi_4.0.0-incubating_amd64.deb

Since this JAR file is available from the Ubuntu repository we depend on it instead of packaging it ourselfs.
2012-10-10 14:41:25 +02:00
Wido den Hollander 62ad5af4d4 debian: Do not package xml-apis for AWS API
This conflicts with with libjaxp1.3-java on Ubuntu systems.

libjaxp1.3-java is installed when maven is installed, so on my local system I got:

root@gateway:/usr/src# dpkg -i cloud-awsapi_4.0.0-incubating_amd64.deb
(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
 trying to overwrite '/usr/share/java/xml-apis-1.3.04.jar', which is also in package libjaxp1.3-java 1.3.05-2ubuntu2
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
 cloud-awsapi_4.0.0-incubating_amd64.deb
root@gateway:/usr/src#

This prevents you from installing the AWS API on a Ubuntu machine which also has Maven installed.

The classpath is still generated by WAF which looks in the deps/ directory and will find the same JAR file
there as what's in the Deb package we depend on.
2012-10-10 14:13:55 +02:00
Rohit Yadav f20d6369e4 Revert: javassist related recent changes
Changes:
 - Have javassist dependency in awsapi/pom.xml
 - Have it deployed by waf while rpm building in wscript_build
 - Fixed dependency in debian/control
 - Add javassist pkg in cloud-deps for debian

This is a squashed commit of the following:

commit eed46e7749f2716d0046f6c8237e9900043078ee
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:42:41 2012 +0530

    Revert: Add javaassist dependence"

    Reverted javassist but axis2-1.5.1.jar is still first in the classpath
    This reverts commit 7bcbae5e91.

commit eab6b6afe9331bf3920fafbd59695141366a2a61
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:38:42 2012 +0530

    Revert: "maven: Remove javassist as a dependency for AWS API"

    We want javassist to be fetched by mvn and get it packaged in
    cloud-deps.
    This reverts commit 8504332404.

commit 35af1ebdb6340105f342dbfc461f5fb892b9ab76
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:36:43 2012 +0530

    Revert: "add javassit on the classpath"

    We don't need javassist from a distro's repo. That is included in
    cloud-deps.
    This reverts commit 66daa1a2bc.

commit cb11d153fbb809aad94f0a3d19f3efba13691d71
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:34:09 2012 +0530

    Revert: "fix rpm build"

    We need javaassist for awsapi package.
    This reverts commit c49f3beccf.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-10 12:49:38 +05:30
Edison Su 7bcbae5e91 axis2-1.5.1.jar should be loaded at first, add javaassist dependence 2012-10-09 19:31:41 -07:00
Edison Su a253fd3f10 add these jars back, 2012-10-09 17:35:40 -07:00
Edison Su b9e936c345 add more dep jar 2012-10-09 15:16:51 -07:00
Wido den Hollander e86e9d3fab debian: Package less cloud-awsapi JAR files
These libraries do not seem to be used/imported in the AWS API code so we don't have to package them
2012-10-09 23:41:48 +02:00
Wido den Hollander 5f2f3c22cc debian: Dependency update cloud-awsapi
A lot of JAR files are provided by the Debian and Ubuntu package repositories.

We can depend on them instead of packaging them ourselfs.
2012-10-09 23:38:50 +02:00
Edison Su af17555089 fix ubuntu deb build 2012-10-09 13:27:22 -07:00
Edison Su ffe1dbbf53 add aws deb build 2012-10-09 13:27:22 -07:00