[pkg-java] r14465 - trunk/maven-war-plugin/debian
Torsten Werner
twerner at alioth.debian.org
Wed Aug 24 21:54:39 UTC 2011
Author: twerner
Date: 2011-08-24 21:54:39 +0000 (Wed, 24 Aug 2011)
New Revision: 14465
Added:
trunk/maven-war-plugin/debian/TODO
trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.doc-base.api
trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.install
trunk/maven-war-plugin/debian/maven.cleanIgnoreRules
trunk/maven-war-plugin/debian/maven.ignoreRules
trunk/maven-war-plugin/debian/maven.publishedRules
Modified:
trunk/maven-war-plugin/debian/changelog
trunk/maven-war-plugin/debian/control
trunk/maven-war-plugin/debian/copyright
trunk/maven-war-plugin/debian/libmaven-war-plugin-java.poms
trunk/maven-war-plugin/debian/maven.properties
trunk/maven-war-plugin/debian/maven.rules
trunk/maven-war-plugin/debian/orig-tar.sh
Log:
* Add a documentation package.
* Enable tests but ignore failures and errors.
Added: trunk/maven-war-plugin/debian/TODO
===================================================================
--- trunk/maven-war-plugin/debian/TODO (rev 0)
+++ trunk/maven-war-plugin/debian/TODO 2011-08-24 21:54:39 UTC (rev 14465)
@@ -0,0 +1 @@
+- fix test failures and errors
Modified: trunk/maven-war-plugin/debian/changelog
===================================================================
--- trunk/maven-war-plugin/debian/changelog 2011-08-24 21:43:03 UTC (rev 14464)
+++ trunk/maven-war-plugin/debian/changelog 2011-08-24 21:54:39 UTC (rev 14465)
@@ -3,8 +3,10 @@
* 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 <twerner at debian.org> Wed, 24 Aug 2011 23:41:09 +0200
+ -- Torsten Werner <twerner at debian.org> Wed, 24 Aug 2011 23:50:10 +0200
maven-war-plugin (2.1~beta1-1) unstable; urgency=low
Modified: trunk/maven-war-plugin/debian/control
===================================================================
--- trunk/maven-war-plugin/debian/control 2011-08-24 21:43:03 UTC (rev 14464)
+++ trunk/maven-war-plugin/debian/control 2011-08-24 21:54:39 UTC (rev 14465)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-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 @@
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 @@
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.
Modified: trunk/maven-war-plugin/debian/copyright
===================================================================
--- trunk/maven-war-plugin/debian/copyright 2011-08-24 21:43:03 UTC (rev 14464)
+++ trunk/maven-war-plugin/debian/copyright 2011-08-24 21:54:39 UTC (rev 14465)
@@ -13,7 +13,7 @@
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
Added: trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.doc-base.api
===================================================================
--- trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.doc-base.api (rev 0)
+++ trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.doc-base.api 2011-08-24 21:54:39 UTC (rev 14465)
@@ -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/*
Added: trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.install
===================================================================
--- trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.install (rev 0)
+++ trunk/maven-war-plugin/debian/libmaven-war-plugin-java-doc.install 2011-08-24 21:54:39 UTC (rev 14465)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmaven-war-plugin-java/api
+
Modified: trunk/maven-war-plugin/debian/libmaven-war-plugin-java.poms
===================================================================
--- trunk/maven-war-plugin/debian/libmaven-war-plugin-java.poms 2011-08-24 21:43:03 UTC (rev 14464)
+++ trunk/maven-war-plugin/debian/libmaven-war-plugin-java.poms 2011-08-24 21:54:39 UTC (rev 14465)
@@ -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
Added: trunk/maven-war-plugin/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/maven-war-plugin/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/maven-war-plugin/debian/maven.cleanIgnoreRules 2011-08-24 21:54:39 UTC (rev 14465)
@@ -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/
+
Added: trunk/maven-war-plugin/debian/maven.ignoreRules
===================================================================
--- trunk/maven-war-plugin/debian/maven.ignoreRules (rev 0)
+++ trunk/maven-war-plugin/debian/maven.ignoreRules 2011-08-24 21:54:39 UTC (rev 14465)
@@ -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/
+
Modified: trunk/maven-war-plugin/debian/maven.properties
===================================================================
--- trunk/maven-war-plugin/debian/maven.properties 2011-08-24 21:43:03 UTC (rev 14464)
+++ trunk/maven-war-plugin/debian/maven.properties 2011-08-24 21:54:39 UTC (rev 14465)
@@ -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
Added: trunk/maven-war-plugin/debian/maven.publishedRules
===================================================================
--- trunk/maven-war-plugin/debian/maven.publishedRules (rev 0)
+++ trunk/maven-war-plugin/debian/maven.publishedRules 2011-08-24 21:54:39 UTC (rev 14465)
@@ -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/
+
Modified: trunk/maven-war-plugin/debian/maven.rules
===================================================================
--- trunk/maven-war-plugin/debian/maven.rules 2011-08-24 21:43:03 UTC (rev 14464)
+++ trunk/maven-war-plugin/debian/maven.rules 2011-08-24 21:54:39 UTC (rev 14465)
@@ -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/ * *
Modified: trunk/maven-war-plugin/debian/orig-tar.sh
===================================================================
--- trunk/maven-war-plugin/debian/orig-tar.sh 2011-08-24 21:43:03 UTC (rev 14464)
+++ trunk/maven-war-plugin/debian/orig-tar.sh 2011-08-24 21:54:39 UTC (rev 14465)
@@ -5,7 +5,7 @@
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
More information about the pkg-java-commits
mailing list