Author: twerner
Date: 2011-09-20 21:16:26 +0000 (Tue, 20 Sep 2011)
New Revision: 14968
Added:
trunk/maven-common-artifact-filters/debian/README.source
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.doc-base.api
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.install
trunk/maven-common-artifact-filters/debian/maven.cleanIgnoreRules
trunk/maven-common-artifact-filters/debian/maven.properties
trunk/maven-common-artifact-filters/debian/maven.publishedRules
Removed:
trunk/maven-common-artifact-filters/debian/build.properties
trunk/maven-common-artifact-filters/debian/maven-settings.xml
Modified:
trunk/maven-common-artifact-filters/debian/changelog
trunk/maven-common-artifact-filters/debian/control
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms
trunk/maven-common-artifact-filters/debian/maven.ignoreRules
trunk/maven-common-artifact-filters/debian/maven.rules
trunk/maven-common-artifact-filters/debian/orig-tar.sh
trunk/maven-common-artifact-filters/debian/rules
trunk/maven-common-artifact-filters/debian/watch
Log:
* Use Maven to build the package.
* Add a documentation package.
Added: trunk/maven-common-artifact-filters/debian/README.source
===================================================================
--- trunk/maven-common-artifact-filters/debian/README.source
(rev 0)
+++ trunk/maven-common-artifact-filters/debian/README.source 2011-09-20
21:16:26 UTC (rev 14968)
@@ -0,0 +1,9 @@
+Information about maven-common-artifact-filters
+-----------------------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
Deleted: trunk/maven-common-artifact-filters/debian/build.properties
===================================================================
--- trunk/maven-common-artifact-filters/debian/build.properties 2011-09-20
21:03:39 UTC (rev 14967)
+++ trunk/maven-common-artifact-filters/debian/build.properties 2011-09-20
21:16:26 UTC (rev 14968)
@@ -1,4 +0,0 @@
-javadoc.dir=target/api
-build.directory=target
-maven.test.skip=true
-
Modified: trunk/maven-common-artifact-filters/debian/changelog
===================================================================
--- trunk/maven-common-artifact-filters/debian/changelog 2011-09-20
21:03:39 UTC (rev 14967)
+++ trunk/maven-common-artifact-filters/debian/changelog 2011-09-20
21:16:26 UTC (rev 14968)
@@ -6,8 +6,10 @@
* Switch to source format 3.0.
* Switch to debhelper level 7.
* Update Standards-Version: 3.9.2.
+ * Use Maven to build the package.
+ * Add a documentation package.
- -- Torsten Werner <twer...@debian.org> Tue, 20 Sep 2011 23:01:46 +0200
+ -- Torsten Werner <twer...@debian.org> Tue, 20 Sep 2011 23:11:02 +0200
maven-common-artifact-filters (1.1-3) unstable; urgency=low
Modified: trunk/maven-common-artifact-filters/debian/control
===================================================================
--- trunk/maven-common-artifact-filters/debian/control 2011-09-20 21:03:39 UTC
(rev 14967)
+++ trunk/maven-common-artifact-filters/debian/control 2011-09-20 21:16:26 UTC
(rev 14968)
@@ -3,9 +3,11 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.cla...@laposte.net>
-Build-Depends: ant, debhelper (>= 7), cdbs, default-jdk, libjaxp1.3-java
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant-optional,
- libmaven2-core-java, libplexus-container-default-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>=
1.4)
+Build-Depends-Indep: libmaven-plugin-testing-java, libmaven2-core-java,
libplexus-container-default-java,
+ libplexus-utils-java, junit (>= 3.8.1), libeasymock-java,
libmaven-plugin-testing-java,
+ default-jdk-doc, libmaven2-core-java-doc,
libplexus-container-default-java-doc,
+ libplexus-utils-java-doc, libmaven-javadoc-plugin-java
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-common-artifact-filters
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-java/trunk/maven-common-artifact-filters/
@@ -13,7 +15,9 @@
Package: libmaven-common-artifact-filters-java
Architecture: all
-Depends: ${misc:Depends}, libmaven2-core-java, libplexus-container-default-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libmaven-common-artifact-filters-java-doc
Description: Maven Common Artifact Filters
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,
@@ -33,3 +37,28 @@
This package ships a shared library containing a collection of ready-made
filters to control inclusion/exclusion of artifacts during dependency
resolution.
+
+Package: libmaven-common-artifact-filters-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libmaven-common-artifact-filters-java
+Description: Documentation for Maven Common Artifact Filters
+ 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-common-artifact-filters-java.
Added:
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.doc-base.api
===================================================================
---
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.doc-base.api
(rev 0)
+++
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.doc-base.api
2011-09-20 21:16:26 UTC (rev 14968)
@@ -0,0 +1,10 @@
+Document: libmaven-common-artifact-filters-java
+Title: API Javadoc for Maven Common Artifact Filters
+Author: Maven Common Artifact Filters developers
+Abstract: This is the API Javadoc provided for the
+ libmaven-common-artifact-filters-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmaven-common-artifact-filters-java/api/index.html
+Files: /usr/share/doc/libmaven-common-artifact-filters-java/api/*
Added:
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.install
===================================================================
---
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.install
(rev 0)
+++
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java-doc.install
2011-09-20 21:16:26 UTC (rev 14968)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmaven-common-artifact-filters-java/api
+
Modified:
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms
===================================================================
---
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms
2011-09-20 21:03:39 UTC (rev 14967)
+++
trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms
2011-09-20 21:16:26 UTC (rev 14968)
@@ -1,2 +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
Deleted: trunk/maven-common-artifact-filters/debian/maven-settings.xml
===================================================================
--- trunk/maven-common-artifact-filters/debian/maven-settings.xml
2011-09-20 21:03:39 UTC (rev 14967)
+++ trunk/maven-common-artifact-filters/debian/maven-settings.xml
2011-09-20 21:16:26 UTC (rev 14968)
@@ -1,9 +0,0 @@
-<!--
- This is a minimal settings.xml that switches maven to offline mode
- and uses the Debian repo as the local repo.
--->
-
-<settings>
- <localRepository>/usr/share/maven-repo</localRepository>
- <offline>true</offline>
-</settings>
Added: trunk/maven-common-artifact-filters/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/maven-common-artifact-filters/debian/maven.cleanIgnoreRules
(rev 0)
+++ trunk/maven-common-artifact-filters/debian/maven.cleanIgnoreRules
2011-09-20 21:16:26 UTC (rev 14968)
@@ -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/
+
Modified: trunk/maven-common-artifact-filters/debian/maven.ignoreRules
===================================================================
--- trunk/maven-common-artifact-filters/debian/maven.ignoreRules
2011-09-20 21:03:39 UTC (rev 14967)
+++ trunk/maven-common-artifact-filters/debian/maven.ignoreRules
2011-09-20 21:16:26 UTC (rev 14968)
@@ -1,2 +1,16 @@
-* maven-plugin-testing-harness *
+# 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/
Added: trunk/maven-common-artifact-filters/debian/maven.properties
===================================================================
--- trunk/maven-common-artifact-filters/debian/maven.properties
(rev 0)
+++ trunk/maven-common-artifact-filters/debian/maven.properties 2011-09-20
21:16:26 UTC (rev 14968)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/maven-common-artifact-filters/debian/maven.publishedRules
===================================================================
--- trunk/maven-common-artifact-filters/debian/maven.publishedRules
(rev 0)
+++ trunk/maven-common-artifact-filters/debian/maven.publishedRules
2011-09-20 21:16:26 UTC (rev 14968)
@@ -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-common-artifact-filters/debian/maven.rules
===================================================================
--- trunk/maven-common-artifact-filters/debian/maven.rules 2011-09-20
21:03:39 UTC (rev 14967)
+++ trunk/maven-common-artifact-filters/debian/maven.rules 2011-09-20
21:16:26 UTC (rev 14968)
@@ -1,3 +1,26 @@
-org.codehaus.plexus plexus-container-default dependency
s/1\.0-alpha.*/1.0-alpha/
-junit junit jar s/3\..*/3.x/
-asm asm 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/ * *
+org.apache.maven.shared maven-common-artifact-filters jar s/.*/debian/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+s/easymock/org.easymock/ easymock * s/.*/debian/ * *
+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-common-artifact-filters/debian/orig-tar.sh
===================================================================
--- trunk/maven-common-artifact-filters/debian/orig-tar.sh 2011-09-20
21:03:39 UTC (rev 14967)
+++ trunk/maven-common-artifact-filters/debian/orig-tar.sh 2011-09-20
21:16:26 UTC (rev 14968)
@@ -1,16 +1,16 @@
#!/bin/sh -e
-TAR=../maven-common-artifact-filters_$2.orig.tar.gz
-DIR=maven-common-artifact-filters-$2
-TAG=maven-common-artifact-filters-$2
+VERSION=$2
+TAR=../maven-common-artifact-filters_$VERSION.orig.tar.gz
+DIR=maven-common-artifact-filters-$VERSION
+TAG=$(echo "maven-common-artifact-filters-$VERSION" | sed
-re's/~(alpha|beta)/-\1-/')
-svn export http://svn.apache.org/repos/asf/maven/shared/tags/$TAG $DIR
-tar -c -z -f $TAR $DIR
+svn export http://svn.apache.org/repos/asf/maven/shared/tags/${TAG}/ $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
rm -rf $DIR ../$TAG
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
fi
Modified: trunk/maven-common-artifact-filters/debian/rules
===================================================================
--- trunk/maven-common-artifact-filters/debian/rules 2011-09-20 21:03:39 UTC
(rev 14967)
+++ trunk/maven-common-artifact-filters/debian/rules 2011-09-20 21:16:26 UTC
(rev 14968)
@@ -1,24 +1,9 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api
maven-plugin-descriptor maven-plugin-registry \
- maven-project maven-artifact maven-artifact-manager
plexus-container-default-alpha plexus-utils
-DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
-Dversion=$(VERSION)
-API_DOCS := target/api
+JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l pom.xml
target/$(PACKAGE)-$(VERSION).jar
-
-clean::
- -rm -rf debian/tmp
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
Modified: trunk/maven-common-artifact-filters/debian/watch
===================================================================
--- trunk/maven-common-artifact-filters/debian/watch 2011-09-20 21:03:39 UTC
(rev 14967)
+++ trunk/maven-common-artifact-filters/debian/watch 2011-09-20 21:16:26 UTC
(rev 14968)
@@ -1,3 +1,4 @@
version=3
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
http://svn.apache.org/repos/asf/maven/shared/tags/ \
- maven-common-artifact-filters-(.*)/ debian debian/orig-tar.sh
+ maven-common-artifact-filters-(\d.*)/ debian debian/orig-tar.sh
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
