This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-war-plugin.
commit c6213dc19036d4efb8d8ab413c3066d6147bdbb9 Author: Torsten Werner <[email protected]> Date: Wed Aug 24 21:54:39 2011 +0000 * Add a documentation package. * Enable tests but ignore failures and errors. --- debian/TODO | 1 + debian/changelog | 4 ++- debian/control | 32 +++++++++++++++++++++--- debian/copyright | 2 +- debian/libmaven-war-plugin-java-doc.doc-base.api | 10 ++++++++ debian/libmaven-war-plugin-java-doc.install | 2 ++ debian/libmaven-war-plugin-java.poms | 27 +++++++++++++++++++- debian/maven.cleanIgnoreRules | 17 +++++++++++++ debian/maven.ignoreRules | 16 ++++++++++++ debian/maven.properties | 7 +++++- debian/maven.publishedRules | 19 ++++++++++++++ debian/maven.rules | 23 ++++++++++++++++- debian/orig-tar.sh | 2 +- 13 files changed, 152 insertions(+), 10 deletions(-) diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..38e91d6 --- /dev/null +++ b/debian/TODO @@ -0,0 +1 @@ +- fix test failures and errors diff --git a/debian/changelog b/debian/changelog index c333bf5..1040c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ maven-war-plugin (2.1~beta1-2) unstable; urgency=low * Team upload. * Switch to source format 3.0. * Update Standards-Version: 3.9.1. + * Add a documentation package. + * Enable tests but ignore failures and errors. - -- Torsten Werner <[email protected]> Wed, 24 Aug 2011 23:41:09 +0200 + -- Torsten Werner <[email protected]> Wed, 24 Aug 2011 23:50:10 +0200 maven-war-plugin (2.1~beta1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 5093e41..a9aa02d 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Ludovic Claude <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper -Build-Depends-Indep: libmaven-invoker-plugin-java (>= 1.3), libmaven-archiver-java, - libmaven-plugin-testing-java, libmaven2-core-java, libplexus-archiver-java, - libplexus-io-java, libxstream-java +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libmaven-archiver-java, libmaven-filtering-java, libmaven2-core-java, libplexus-archiver-java, + libplexus-io-java, libplexus-utils-java, libxstream-java, junit, libmaven-plugin-testing-java, + default-jdk-doc, libmaven2-core-java-doc, libplexus-utils-java-doc, libmaven-javadoc-plugin-java Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-war-plugin Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-war-plugin/ @@ -16,6 +16,7 @@ Package: libmaven-war-plugin-java Architecture: all Depends: ${misc:Depends}, ${maven:Depends} Recommends: ${maven:OptionalDepends} +Suggests: libmaven-war-plugin-java-doc Description: Maven WAR Plugin Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, @@ -35,4 +36,27 @@ Description: Maven WAR Plugin The Maven WAR plugin builds a Web Application Archive (WAR) file from the project output and its dependencies. +Package: libmaven-war-plugin-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libmaven-war-plugin-java +Description: Documentation for Maven WAR Plugin + Maven is a software project management and comprehension tool. Based on the + concept of a project object model (POM), Maven can manage a project's build, + reporting and documentation from a central piece of information. + . + Maven's primary goal is to allow a developer to comprehend the complete + state of a development effort in the shortest period of time. In order to + attain this goal there are several areas of concern that Maven attempts + to deal with: + . + * Making the build process easy + * Providing a uniform build system + * Providing quality project information + * Providing guidelines for best practices development + * Allowing transparent migration to new features + . + This package contains the API documentation of libmaven-war-plugin-java. diff --git a/debian/copyright b/debian/copyright index c373fce..b7ddc89 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ License: GPL-3+ License: Apache-2.0 On Debian GNU/Linux system you can find the complete text of the - Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'. + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' License: GPL-3 On Debian GNU/Linux system you can find the complete text of the diff --git a/debian/libmaven-war-plugin-java-doc.doc-base.api b/debian/libmaven-war-plugin-java-doc.doc-base.api new file mode 100644 index 0000000..546a480 --- /dev/null +++ b/debian/libmaven-war-plugin-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libmaven-war-plugin-java +Title: API Javadoc for Maven WAR Plugin +Author: Maven WAR Plugin developers +Abstract: This is the API Javadoc provided for the + libmaven-war-plugin-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmaven-war-plugin-java/api/index.html +Files: /usr/share/doc/libmaven-war-plugin-java/api/* diff --git a/debian/libmaven-war-plugin-java-doc.install b/debian/libmaven-war-plugin-java-doc.install new file mode 100644 index 0000000..82f14af --- /dev/null +++ b/debian/libmaven-war-plugin-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libmaven-war-plugin-java/api + diff --git a/debian/libmaven-war-plugin-java.poms b/debian/libmaven-war-plugin-java.poms index 43e746b..31a0ccf 100644 --- a/debian/libmaven-war-plugin-java.poms +++ b/debian/libmaven-war-plugin-java.poms @@ -1 +1,26 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --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 +# --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 +# it will be installed with mh_install. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml --no-parent --has-package-version diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..0088a40 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,16 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.properties b/debian/maven.properties index d2f1b82..246a5a1 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -1 +1,6 @@ -maven.test.skip=true +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.failure.ignore=true +maven.test.error.ignore=true diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# 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/ + diff --git a/debian/maven.rules b/debian/maven.rules index 8486979..caad908 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,23 @@ -junit junit jar s/3\..*/3.x/ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# 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/ +junit junit jar s/3\..*/3.x/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index f31f603..132ed1b 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -5,7 +5,7 @@ TAR=../maven-war-plugin_$VERSION.orig.tar.gz DIR=maven-war-plugin-$VERSION TAG=$(echo "maven-war-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') -svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG} $DIR +svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG}/ $DIR GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR rm -rf $DIR ../$TAG -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-war-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
