lp:~yolanda.robla/ubuntu/trusty/tomcat7/add_distribution_static_right_author

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/trusty/tomcat7

Jamie Strandboge: Needs Fixing on 2013-12-20

Diff: 130 lines (+41/-4)

8 files modified

.pc/applied-patches (+1/-0)
build.xml (+1/-0)
debian/changelog (+7/-0)
debian/control (+2/-2)
debian/patches/fix-distribution.patch (+23/-0)
debian/patches/series (+1/-0)
debian/rules (+4/-0)
java/org/apache/catalina/util/ServerInfo.properties (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

29. By Yolanda Robla on 2013-12-03

  * debian/patches/fix-distribution.patch: show distribution instead of OS name
  * debian/control: add lsb-release as build dependency

28. By Gianfranco Costamagna on 2013-07-16

[ Gianfranco Costamagna ]
* Team upload.
* New upstream release.
* Added libhamcrest-java >= 1.3 as build-dep,
  tweaked debian/rules.
* Bumped compat level to 9.
* Removed some version checks, newer releases already in oldstable.
* Refresh patches.
* debian/control: changed Vcs-Git and Vcs-Browser fields,
  now they are canonical.
* Fixed error message in Tomcat init script,
  patch by Thijs Kinkhorst (Closes: #714348)

27. By Jakub Adam on 2013-05-16

* Fix deployment of POMs for libservlet-3.0-java JARs into javax
  coordinates.
  - JARs were deployed into maven-repo, but not POMs.
* Fix servlet-api groupId in d/javaxpoms/jsp-api.pom.

26. By Miguel Landaeta on 2013-05-10

* New upstream release.
  - Addresses security issue: CVE-2013-2071
* Refresh patches:
  - 0015_disable_test_TestCometProcessor.patch

25. By James Page on 2013-04-08

* Fix FTBFS due to expired test certificates (LP: #1166187):
  - d/keystores/*.jks: Newer keystores from upstream 7.0.39.
  - d/rules: Install newer keystores for testing, tidy up after use.
  - d/p/0018-update-test-certificates.patch: Cherry picked fixes from
    upstream VCS to update text based certificates.

24. By James Page on 2013-02-24

Switch from Commons DBCP to Tomcat JDBC Pool as default connection
pool implementation (Closes: #701023).

23. By James Page on 2013-02-20

* Merge from Debian experimental, remaining changes:
  + Enabled Tomcat jdbc-pool module, aligning more closely to upstream and
    providing improved multi-threaded performance over commons-dbcp:
    - d/rules,d/libtomcat7-java.poms: Install tomcat-dbcp.jar file.
    - d/patches/0005-change-default-DBCP-factory-class.patch: Drop patch
      which switches the default DBCP factory to commons-dbcp.
    - d/p/0015-use-jdbc-pool-default.patch: Make jdbc-pool module the
      default pool implementation for DataSources.
    - d/NEWS: let users know about this change.
* Dropped changes, included in Debian:
  - d/p/0014-fix-override.patch: Fix FTBFS due to differing dependency
    versions compared to upstream.

22. By James Page on 2012-12-06

* New upstream release.
  - d/p/0014-fix-override.patch: Fix FTBFS due to differing dependency
    versions compared to upstream.
* d/p/0015-use-jdbc-pool-default.patch: Make jdbc-pool module the default
  pool implementation for DataSources (LP: #1071817).

21. By James Page on 2012-09-17

* New upstream point release including several fixes for Java 7
  specific issues.
* Refreshed patches.

20. By James Page on 2012-07-16

* Re-sync with Debian unstable.
* New upstream release:
  - Refreshed patches.
* Enabled Tomcat jdbc-pool module, aligning more closely to upstream and
  providing improved multi-threaded performance over commons-dbcp:
  - d/rules,d/libtomcat7-java.poms: Install tomcat-dbcp.jar file.
  - d/patches/0005-change-default-DBCP-factory-class.patch: Drop patch
    which switches the default DBCP factory to commons-dbcp.
  - d/NEWS: let users know about this change.