Merge lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge into lp://staging/ubuntu/precise/activemq
Proposed by
Aditya V
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge |
| Merge into: | lp://staging/ubuntu/precise/activemq |
| Diff against target: |
9034 lines (+100/-8562) 24 files modified
.pc/CVE-2011-4605.diff/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (+0/-2389) .pc/CVE-2011-4605.diff/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (+0/-1449) .pc/activemq-admin.patch/assembly/src/release/bin/activemq-admin (+0/-155) .pc/applied-patches (+0/-8) .pc/disable_some_modules.diff/pom.xml (+0/-1320) .pc/drop_derby_use.diff/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DataSourceSupport.java (+0/-96) .pc/exclude_geronimo_jca.diff/activemq-pool/pom.xml (+0/-104) .pc/exclude_geronimo_jca.diff/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java (+0/-187) .pc/exclude_spring_osgi.diff/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java (+0/-51) .pc/init_debian_default_values.diff/assembly/src/release/bin/activemq (+0/-653) .pc/javadoc_links.diff/activemq-core/pom.xml (+0/-705) .pc/javadoc_links.diff/pom.xml (+0/-1328) activemq-core/pom.xml (+4/-3) activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (+2/-22) activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (+0/-23) activemq-core/src/main/java/org/apache/activemq/store/jdbc/DataSourceSupport.java (+5/-6) activemq-pool/pom.xml (+0/-15) activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java (+3/-2) activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java (+2/-2) assembly/src/release/bin/activemq (+53/-22) assembly/src/release/bin/activemq-admin (+1/-1) debian/changelog (+16/-0) debian/libactivemq-java.poms (+4/-4) pom.xml (+10/-17) |
| To merge this branch: | bzr merge lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Needs Fixing | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-07-13.
Description of the change
I fixed the error that caused activemq not to start by merging the Debian Sid branch into this one.
To post a comment you must log in.
Unmerged revisions
- 9. By Aditya V
-
debian/
libactivemq- java.poms: added the options '--java-lib' to
certain lines so that the necessary files are included in the
package and activemq doesn't fail to start (LP: #993249) - 8. By Aditya V
-
* Install the activemq-
{core,console, run} and kahadb jar files to
/usr/share/java. (Closes: #668943)
- Add the necessary --java-lib flag to d/libactivemq-java.poms
* Thanks to Ulrich Dangel for RC bugfix, upload to unstable.
* Merge from Debian unstable, remaining changes:
- debian/control: Build-Depends on junit4 to fix FTBFS. (LP: #993249)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for taking the time to prepare this merge proposal.
As Ubuntu 12.04 is now release this fix will need to go through the Stable Release Update process.
This consitutes a minimal change the the version that is already in Ubuntu 12.04 rather than a merge from Debian Testing.
See https:/