[stapler-adjunct-codemirror] 03/07: Removed the unused dependency on the Servlet API

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository stapler-adjunct-codemirror.

commit 0c8181657ba4bdd6b6dc5747d459f926c2f19d42
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 4 16:07:56 2014 +0200

    Removed the unused dependency on the Servlet API
---
 debian/changelog                               |  1 +
 debian/control                                 |  5 +----
 debian/libstapler-adjunct-codemirror-java.poms | 16 ++++++++++++----
 debian/maven.ignoreRules                       |  2 ++
 debian/maven.rules                             |  2 --
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9f3f1d..c5152b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ stapler-adjunct-codemirror (1.2-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * debian/control:
+    - Removed the unused dependency on the Servlet API
     - Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
 
diff --git a/debian/control b/debian/control
index 736dae8..2d863d4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <jamespage at debian.org>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
-Build-Depends-Indep:
- default-jdk-doc,
- libservlet2.5-java,
- libstapler-java
+Build-Depends-Indep: default-jdk-doc, libstapler-java
 Standards-Version: 3.9.5
 Homepage: http://stapler.java.net
 Vcs-Git: git://git.debian.org/git/pkg-java/stapler-adjunct-codemirror.git
diff --git a/debian/libstapler-adjunct-codemirror-java.poms b/debian/libstapler-adjunct-codemirror-java.poms
index 4473995..8545d14 100644
--- a/debian/libstapler-adjunct-codemirror-java.poms
+++ b/debian/libstapler-adjunct-codemirror-java.poms
@@ -2,19 +2,27 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in /usr/share/java
 #   --usj-version=<version>: version to use when installing the library in /usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
-pom.xml  --no-parent
+pom.xml --no-parent
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..5ad35e6
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+
+javax.servlet servlet-api * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 5060b6b..ce4a3fd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -15,5 +15,3 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
-
-javax.servlet servlet-api jar s/2\..*/2.5/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler-adjunct-codemirror.git