lp:~james-page/ubuntu/oneiric/jenkins-winstone/827651

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/jenkins-winstone

Ubuntu Development Team: Pending requested 2011-08-18

Diff: 21177 lines (+20803/-202)

24 files modified

.pc/applied-patches (+1/-1)
.pc/use_system_servletapi.patch/pom.xml (+0/-151)
debian/README.source (+3/-3)
debian/changelog (+16/-0)
debian/control (+0/-2)
debian/copyright (+9/-0)
debian/libjenkins-winstone-java.classpath (+0/-1)
debian/patches/series (+1/-1)
debian/patches/specification-resources.patch (+10419/-0)
debian/patches/use_system_servletapi.patch (+0/-30)
pom.xml (+0/-13)
src/conf/javax/servlet/resources/XMLSchema.dtd (+402/-0)
src/conf/javax/servlet/resources/datatypes.dtd (+203/-0)
src/conf/javax/servlet/resources/j2ee_1_4.xsd (+1616/-0)
src/conf/javax/servlet/resources/j2ee_web_services_client_1_1.xsd (+353/-0)
src/conf/javax/servlet/resources/javaee_5.xsd (+2102/-0)
src/conf/javax/servlet/resources/javaee_web_services_client_1_2.xsd (+585/-0)
src/conf/javax/servlet/resources/jsp_2_0.xsd (+316/-0)
src/conf/javax/servlet/resources/jsp_2_1.xsd (+349/-0)
src/conf/javax/servlet/resources/web-app_2_2.dtd (+602/-0)
src/conf/javax/servlet/resources/web-app_2_3.dtd (+1022/-0)
src/conf/javax/servlet/resources/web-app_2_4.xsd (+1242/-0)
src/conf/javax/servlet/resources/web-app_2_5.xsd (+1275/-0)
src/conf/javax/servlet/resources/xml.xsd (+287/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #827651: Jenkins fails to start if libservlet2.5-java are installed on the system

Medium

Fix Released

Link a bug report

Related blueprints

3. By James Page on 2011-08-18

* Support offline validation of XML configuration files (LP: #827651):
  - debian/patches/specification-resources.patch: CDDL/GPL-2 licensed
    xsd+DTD resources for all servlet, jsp and j2ee specifications.
  - debian/copyright: documented copyright + license for
    specification-resources.patch.
  - debian/control: Removed dependency on libservlet2.5-java, no longer
    required.
  - debian/patches/series,debian/patches/use_system_servletapi.patch:
    Dropped patch as no longer required.
  - debian/libjenkins-winstone-java.classpath: Dropped as all required
    resources are now included in winstone.

2. By James Page on 2011-06-29

Initial release

1. By James Page on 2011-06-29

Import upstream version 0.9.10-jenkins-25+dfsg