Your message dated Tue, 27 Jan 2015 17:55:25 +0100
with message-id <54c7c2fd.8010...@thykier.net>
and subject line Re: Bug#776393: unblock: tomcat-maven-plugin/1.1-2.2
has caused the Debian Bug report #776393,
regarding unblock: tomcat-maven-plugin/1.1-2.2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
776393: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776393
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package tomcat-maven-plugin, the version 1.1-2.2 fixes
the RC bug #686877, which completes the transition to Tomcat 7.
Thank you
unblock tomcat-maven-plugin/1.1-2.2
dpkg-source: warning: extracting unsigned source package
(/home/ebourg/packaging/tomcat-maven-plugin_1.1-2.2.dsc)
diff -Nru tomcat-maven-plugin-1.1/debian/changelog
tomcat-maven-plugin-1.1/debian/changelog
--- tomcat-maven-plugin-1.1/debian/changelog 2013-05-27 18:54:47.000000000
+0200
+++ tomcat-maven-plugin-1.1/debian/changelog 2015-01-27 16:30:47.000000000
+0100
@@ -1,3 +1,11 @@
+tomcat-maven-plugin (1.1-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build with tomcat7 instead of tomcat6 (Closes: #686877)
+ * Standards-Version updated to 3.9.6 (no changes)
+
+ -- Emmanuel Bourg <ebo...@apache.org> Tue, 27 Jan 2015 16:26:54 +0100
+
tomcat-maven-plugin (1.1-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru tomcat-maven-plugin-1.1/debian/control
tomcat-maven-plugin-1.1/debian/control
--- tomcat-maven-plugin-1.1/debian/control 2013-05-27 18:54:42.000000000
+0200
+++ tomcat-maven-plugin-1.1/debian/control 2015-01-27 16:30:47.000000000
+0100
@@ -9,10 +9,10 @@
, maven-repo-helper
Build-Depends-Indep:
libplexus-component-metadata-java
- , tomcat6-common
+ , tomcat7-common
, libmaven-plugin-tools-java
, libsurefire-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
Homepage: http://mojo.codehaus.org/tomcat-maven-plugin
Vcs-Git: git://git.debian.org/collab-maint/tomcat-maven-plugin.git
Vcs-Browser:
http://git.debian.org/?p=collab-maint/tomcat-maven-plugin.git;a=summary
@@ -22,7 +22,7 @@
Depends:
${misc:Depends}
, ${maven:Depends}
- , libtomcat6-java
+ , libtomcat7-java
, libcommons-codec-java
, libwagon-java
, libplexus-archiver-java
diff -Nru tomcat-maven-plugin-1.1/debian/maven.rules
tomcat-maven-plugin-1.1/debian/maven.rules
--- tomcat-maven-plugin-1.1/debian/maven.rules 2011-11-26 17:44:40.000000000
+0100
+++ tomcat-maven-plugin-1.1/debian/maven.rules 2015-01-27 16:30:47.000000000
+0100
@@ -1,7 +1,14 @@
org.codehaus.plexus plexus-component-metadata pom s/1\.*/1.0-beta-3.0.7/
s/org.apache.tomcat/commons-dbcp/ s/dbcp/commons-dbcp/ jar s/.*/debian/
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/
-s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/2.1/
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/3.0/
+s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.2/
+s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/2.2/
+
+org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/debian/ * *
+org.apache.tomcat s/catalina-ha/tomcat-catalina-ha/ * s/.*/debian/ * *
+org.apache.tomcat s/coyote/tomcat-coyote/ * s/.*/debian/ * *
+org.apache.tomcat s/jasper/tomcat-jasper/ * s/.*/debian/ * *
+org.apache.tomcat s/jasper-el/tomcat-jasper-el/ * s/.*/debian/ * *
+org.apache.tomcat s/tribes/tomcat-tribes/ * s/.*/debian/ * *
maven-surefire-plugin maven-plugin s/.*/2.10/
diff -Nru tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch
tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch
--- tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch 2011-11-26
17:44:40.000000000 +0100
+++ tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch 2015-01-27
16:30:47.000000000 +0100
@@ -14,7 +14,7 @@
<version>${tomcat.version}</version>
- <scope>runtime</scope>
+ <scope>system</scope>
-+ <systemPath>/usr/share/tomcat6/lib/jasper-jdt.jar</systemPath>
++ <systemPath>/usr/share/java/ecj.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff -Nru tomcat-maven-plugin-1.1/debian/patches/02-tomcat7-compatibility.patch
tomcat-maven-plugin-1.1/debian/patches/02-tomcat7-compatibility.patch
--- tomcat-maven-plugin-1.1/debian/patches/02-tomcat7-compatibility.patch
1970-01-01 01:00:00.000000000 +0100
+++ tomcat-maven-plugin-1.1/debian/patches/02-tomcat7-compatibility.patch
2015-01-27 16:30:47.000000000 +0100
@@ -0,0 +1,73 @@
+Description: Depend on Tomcat 7 instead of Tomcat 6
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: not-needed
+
+--- a/src/main/java/org/codehaus/mojo/tomcat/AbstractRunMojo.java
++++ b/src/main/java/org/codehaus/mojo/tomcat/AbstractRunMojo.java
+@@ -310,7 +310,7 @@
+ }
+
+ context.setLoader( createWebappLoader() );
+- context.setConfigFile( getContextFile().getAbsolutePath() );
++ context.setConfigFile( getContextFile().toURI().toURL() );
+
+ return context;
+ }
+@@ -479,6 +479,7 @@
+ setupSystemProperties();
+ try
+ {
++ System.setProperty( "catalina.base",
configurationDir.getAbsolutePath() );
+
+ if ( serverXml != null )
+ {
+@@ -487,15 +488,14 @@
+ throw new MojoExecutionException( serverXml.getPath() + "
not exists" );
+ }
+
+- container = new Catalina();
+- container.setCatalinaHome( configurationDir.getAbsolutePath()
);
++ Catalina container = new Catalina();
+ ( (Catalina) container ).setConfigFile( serverXml.getPath() );
+ container.start();
+ }
+ else
+ {
+ // create server
+- container = new Embedded();
++ Embedded container = new Embedded();
+ container.setCatalinaHome( configurationDir.getAbsolutePath()
);
+ container.setRealm( new MemoryRealm() );
+
+@@ -552,12 +552,13 @@
+ container.addConnector( httpsConnector );
+
+ }
+- }
+
+- // start server
+- container.start();
++ // start server
++ container.start();
++
++ EmbeddedRegistry.getInstance().register(container);
++ }
+
+- EmbeddedRegistry.getInstance().register(container);
+ }
+ finally
+ {
+@@ -709,7 +710,12 @@
+ WebappLoader webappLoader = new WebappLoader(
Thread.currentThread().getContextClassLoader() );
+ Context context = container.createContext( "/" +
artifact.getArtifactId(), artifactWarDir.getAbsolutePath() );
+ context.setLoader( webappLoader );
+- context.setConfigFile( getContextFile().getAbsolutePath() );
++ try {
++ context.setConfigFile( getContextFile().toURI().toURL() );
++ } catch (MalformedURLException e) {
++ getLog().error(e.getMessage(), e);
++ e.printStackTrace();
++ }
+ contexts.add( context );
+ }
+ }
diff -Nru tomcat-maven-plugin-1.1/debian/patches/series
tomcat-maven-plugin-1.1/debian/patches/series
--- tomcat-maven-plugin-1.1/debian/patches/series 2011-11-26
17:44:40.000000000 +0100
+++ tomcat-maven-plugin-1.1/debian/patches/series 2015-01-27
16:30:47.000000000 +0100
@@ -1,2 +1,3 @@
00-fix_build.patch
01-fix_source.patch
+02-tomcat7-compatibility.patch
--- End Message ---
--- Begin Message ---
On 2015-01-27 17:42, Emmanuel Bourg wrote:
> Control: tags -1 - moreinfo
>
> Thank you for the review Niels. This is intended, 'container' is a
> private field of the AbstractRunMojo class, and it's only used in the
> startContainer() method. I could have removed the field declaration but
> that doesn't make any difference.
>
> Emmanuel Bourg
>
Excellent, I have unblocked tomcat-maven-plugin.
Thanks,
~Niels
--- End Message ---
