[annotation-indexer] 08/11: Disabled the tests since they rely on com.jolira:hickory which isn't in Debian

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository annotation-indexer.

commit 288e0db99e2b1d3bda6f027c66f871072efeeb03
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 3 16:57:12 2014 +0200

    Disabled the tests since they rely on com.jolira:hickory which isn't in Debian
---
 debian/changelog                       |  2 ++
 debian/control                         |  2 +-
 debian/libannotation-indexer-java.poms | 14 +++++++++++---
 debian/maven.ignoreRules               |  1 +
 debian/maven.properties                |  1 +
 debian/maven.rules                     |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e734572..0ff9733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ annotation-indexer (1.7-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patch
+    - Disabled the tests since they rely on com.jolira:hickory
+      which isn't in Debian
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields
diff --git a/debian/control b/debian/control
index ccbd7fe..301bb63 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: James Page <james.page at ubuntu.com>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
- junit,
+ junit4,
  libmaven-compiler-plugin-java,
  libmaven-enforcer-plugin-java,
  libmaven-javadoc-plugin-java,
diff --git a/debian/libannotation-indexer-java.poms b/debian/libannotation-indexer-java.poms
index 731356a..b68401f 100644
--- a/debian/libannotation-indexer-java.poms
+++ b/debian/libannotation-indexer-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 --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 0088a40..2791606 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,3 +14,4 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/
 
+com.jolira hickory * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 7c29bd7..e593715 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -2,3 +2,4 @@
 # For example:
 # maven.test.skip=true
 
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
index be4177c..39496fb 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,4 +16,4 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/annotation-indexer.git