lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/precise/activemq

James Page: Approve on 2012-07-17

Ubuntu branches: Pending requested 2012-07-13

Diff: 17152 lines (+12/-8449)

14 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)
debian/changelog (+8/-0)
debian/libactivemq-java.poms (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9. By Aditya V on 2012-07-17

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 on 2012-05-18

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

7. By James Page on 2012-04-04

* Merge from Debian unstable, remaining changes:
  - d/control: Build-Depends on junit4 to fix FTBFS.

6. By Angel Abad on 2012-04-03

debian/control: Build-Depends on junit4, fix FTBFS

5. By Damien Raude-Morvan on 2011-10-26

d/activemq.init: Merge change proposed by Jonas Genannt to allow
console startup, useful for debugging purposes. (Closes: #645241).

4. By Damien Raude-Morvan on 2011-10-11

* d/control: Wrap-and-sort Build-Depends.
* d/activemq.links: Since libasm3-java package now provide splited JAR
  also link all ASM3 jars (Closes: #644834).
* d/maven.rules:
  - Don't replace osgi artifacts since they are now provided by
  official osgi-core package.
  - Force 2.1.1 version of maven-war-plugin.

3. By Damien Raude-Morvan on 2011-09-04

* Drop d/patches/exclude_xsd_install.diff and install XSD files into JAR.
* Build-Depends on libxbean-java 3.7 for maven-xbean-plugin.
* Add new "activemq" package to start ActiveMQ server:
  - d/activemq.{postinst,prerm}: Create a activemq system user
  - d/activemq.{install,links}: Install activemq and activemq-admin commands
    to /usr/bin/, set /usr/share/activemq/ as ACTIVEMQ_HOME and install
    many examples into /usr/share/doc/activemq/examples/.
  - d/activemq.README.Debian: Describe how to setup an alternative
    instance (Closes: #634868).
  - Provide a way to handle multi-instances of activemq. Each directory
    inside /etc/activemq/instances-enabled/ will be started as an
    instance with its own configuration. Thanks to Jonas Genannt for patch.
* d/patches/javadoc_links.diff: Update links to system-wide Javadoc.
* d/libactivemq-java.README.Debian: Describe disabled features regarding
  upstream package.
* d/control: Don't use package name in synospis.

2. By Damien Raude-Morvan on 2011-06-21

Initial release (Closes: #627778).

1. By Damien Raude-Morvan on 2011-06-21

Import upstream version 5.5.0+dfsg