[pkg-java] r14498 - in trunk/plexus-component-api/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Fri Aug 26 09:05:45 UTC 2011
Author: twerner
Date: 2011-08-26 09:05:44 +0000 (Fri, 26 Aug 2011)
New Revision: 14498
Added:
trunk/plexus-component-api/debian/README.source
trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base.api
trunk/plexus-component-api/debian/libplexus-component-api-java-doc.install
trunk/plexus-component-api/debian/maven.cleanIgnoreRules
trunk/plexus-component-api/debian/maven.ignoreRules
trunk/plexus-component-api/debian/maven.properties
trunk/plexus-component-api/debian/maven.publishedRules
trunk/plexus-component-api/debian/maven.rules
trunk/plexus-component-api/debian/patches/
trunk/plexus-component-api/debian/patches/0001-add-version-to-plexus-classworlds.patch
trunk/plexus-component-api/debian/patches/series
Removed:
trunk/plexus-component-api/debian/build.xml
trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base
Modified:
trunk/plexus-component-api/debian/changelog
trunk/plexus-component-api/debian/control
trunk/plexus-component-api/debian/libplexus-component-api-java.poms
trunk/plexus-component-api/debian/rules
Log:
Use Maven to build the package.
Added: trunk/plexus-component-api/debian/README.source
===================================================================
--- trunk/plexus-component-api/debian/README.source (rev 0)
+++ trunk/plexus-component-api/debian/README.source 2011-08-26 09:05:44 UTC (rev 14498)
@@ -0,0 +1,9 @@
+Information about plexus-component-api
+------------------------------
+
+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/plexus-component-api/debian/build.xml
===================================================================
--- trunk/plexus-component-api/debian/build.xml 2011-08-26 08:46:09 UTC (rev 14497)
+++ trunk/plexus-component-api/debian/build.xml 2011-08-26 09:05:44 UTC (rev 14498)
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- This build.xml file was written for the Debian build of plexus-component-api.
- This file copyright (c) Paul Cager <paul-debian at home.paulcager.org>
-
- This software and documentation is provided "as is," and
- the copyright holders and contributing author(s) make no
- representations or warranties, express or implied, including
- but not limited to, warranties of merchantability or fitness
- for any particular purpose or that the use of the software or
- documentation will not infringe any third party patents,
- copyrights, trademarks or other rights.
-
- The copyright holders and contributing author(s) will not be
- liable for any direct, indirect, special or consequential damages
- arising out of any use of the software or documentation, even if
- advised of the possibility of such damage.
-
- Permission is hereby granted to use, copy, modify, and distribute
- this source code, or portions hereof, documentation and executables,
- for any purpose, without fee, subject to the following restrictions:
-
- 1. The origin of this source code must not be misrepresented.
- 2. Altered versions must be plainly marked as such and must
- not be misrepresented as being the original source.
- 3. This Copyright notice may not be removed or altered from any
- source or altered source distribution.
--->
-
-<project name="plexus-component-api" default="package" basedir="..">
-
-<target name="package" depends="jar,javadoc"/>
-
-<target name="init">
- <property name="src.dir" value="src"/>
- <property name="build.dir" value="build"/>
- <property name="jar" value="${build.dir}/${package}-${version}.jar"/>
- <property name="javadoc.dir" value="${build.dir}/doc/api"/>
- <echo message="Classpath: ${java.class.path}" />
-</target>
-
-<target name="compile" depends="init">
- <mkdir dir="${build.dir}"/>
- <javac srcdir="${src.dir}/main"
- destdir="${build.dir}"
- includes="**/*.java"
- debug="on"
- />
-</target>
-
-<target name="jar" depends="compile">
- <delete file="${jar}"/>
-
- <jar jarfile="${jar}"
- basedir="${build.dir}"
- includes="**/*.class,**/*.properties"
- />
-</target>
-
-<target name="javadoc" depends="init">
- <mkdir dir="${javadoc.dir}"/>
- <javadoc packagenames="org.codehaus.plexus.*"
- sourcepath="${src.dir}/main/java"
- destdir="${javadoc.dir}"
- author="true"
- version="true"
- windowtitle="${package} API"
- doctitle="${package} - ${version}"
- classpath="${java.class.path}"
- >
- <link packagelistLoc="/usr/share/doc/libplexus-classworlds-java/api"
- href="/usr/share/doc/libplexus-classworlds-java/api/" />
- <link packagelistLoc="/usr/share/doc/classpath-doc/api"
- href="/usr/share/doc/classpath-doc/api/" />
- <link packagelistLoc="/usr/share/doc/libplexus-utils-java/api"
- href="/usr/share/doc/libplexus-utils-java/api/" />
- </javadoc>
-</target>
-
-<target name="clean" depends="init">
- <delete dir="${build.dir}"/>
-</target>
-</project>
Modified: trunk/plexus-component-api/debian/changelog
===================================================================
--- trunk/plexus-component-api/debian/changelog 2011-08-26 08:46:09 UTC (rev 14497)
+++ trunk/plexus-component-api/debian/changelog 2011-08-26 09:05:44 UTC (rev 14498)
@@ -6,8 +6,9 @@
* Switch to debhelper level 7.
* Update Standards-Version: 3.9.1.
* Remove Paul from Uploaders list.
+ * Use Maven to build the package.
- -- Torsten Werner <twerner at debian.org> Fri, 26 Aug 2011 10:41:25 +0200
+ -- Torsten Werner <twerner at debian.org> Fri, 26 Aug 2011 10:53:07 +0200
plexus-component-api (1.0.0~alpha22-2) unstable; urgency=low
Modified: trunk/plexus-component-api/debian/control
===================================================================
--- trunk/plexus-component-api/debian/control 2011-08-26 08:46:09 UTC (rev 14497)
+++ trunk/plexus-component-api/debian/control 2011-08-26 09:05:44 UTC (rev 14498)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: maven-repo-helper, ant, ant-optional,
- libxalan2-java, libplexus-classworlds-java, libplexus-classworlds-java-doc
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-javadoc-plugin-java, libplexus-classworlds-java, default-jdk-doc,
+ libplexus-classworlds-java-doc
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-component-api
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-component-api
@@ -13,8 +13,8 @@
Package: libplexus-component-api-java
Architecture: all
-Depends: ${misc:Depends}, libplexus-classworlds-java
-Recommends: libplexus-containers-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
Suggests: libplexus-component-api-java-doc
Description: utilities for the Plexus framework
The Plexus project provides a full software stack for creating and executing
@@ -38,7 +38,8 @@
Package: libplexus-component-api-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, classpath-doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
Suggests: libplexus-component-api-java
Description: API Documentation for plexus-component-api
The Plexus project provides a full software stack for creating and executing
Deleted: trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base
===================================================================
--- trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base 2011-08-26 08:46:09 UTC (rev 14497)
+++ trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base 2011-08-26 09:05:44 UTC (rev 14498)
@@ -1,9 +0,0 @@
-Document: libplexus-component-api-java
-Title: API Javadoc for plexus-component-api
-Author: plexus-component-api developers
-Abstract: This is the API Javadoc provided by the plexus-component-api library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-component-api-java/api/index.html
-Files: /usr/share/doc/libplexus-component-api-java/api/*
Copied: trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base.api (from rev 14496, trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base)
===================================================================
--- trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base.api (rev 0)
+++ trunk/plexus-component-api/debian/libplexus-component-api-java-doc.doc-base.api 2011-08-26 09:05:44 UTC (rev 14498)
@@ -0,0 +1,10 @@
+Document: libplexus-component-api-java
+Title: API Javadoc for Plexus Component API
+Author: Plexus Component API developers
+Abstract: This is the API Javadoc provided for the
+ libplexus-component-api-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libplexus-component-api-java/api/index.html
+Files: /usr/share/doc/libplexus-component-api-java/api/*
Added: trunk/plexus-component-api/debian/libplexus-component-api-java-doc.install
===================================================================
--- trunk/plexus-component-api/debian/libplexus-component-api-java-doc.install (rev 0)
+++ trunk/plexus-component-api/debian/libplexus-component-api-java-doc.install 2011-08-26 09:05:44 UTC (rev 14498)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libplexus-component-api-java/api
+
Modified: trunk/plexus-component-api/debian/libplexus-component-api-java.poms
===================================================================
--- trunk/plexus-component-api/debian/libplexus-component-api-java.poms 2011-08-26 08:46:09 UTC (rev 14497)
+++ trunk/plexus-component-api/debian/libplexus-component-api-java.poms 2011-08-26 09:05:44 UTC (rev 14498)
@@ -1 +1,26 @@
-pom.xml
+# 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/plexus-component-api/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/plexus-component-api/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/plexus-component-api/debian/maven.cleanIgnoreRules 2011-08-26 09:05:44 UTC (rev 14498)
@@ -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/plexus-component-api/debian/maven.ignoreRules
===================================================================
--- trunk/plexus-component-api/debian/maven.ignoreRules (rev 0)
+++ trunk/plexus-component-api/debian/maven.ignoreRules 2011-08-26 09:05:44 UTC (rev 14498)
@@ -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/
+
Added: trunk/plexus-component-api/debian/maven.properties
===================================================================
--- trunk/plexus-component-api/debian/maven.properties (rev 0)
+++ trunk/plexus-component-api/debian/maven.properties 2011-08-26 09:05:44 UTC (rev 14498)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/plexus-component-api/debian/maven.publishedRules
===================================================================
--- trunk/plexus-component-api/debian/maven.publishedRules (rev 0)
+++ trunk/plexus-component-api/debian/maven.publishedRules 2011-08-26 09:05:44 UTC (rev 14498)
@@ -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/
+
Added: trunk/plexus-component-api/debian/maven.rules
===================================================================
--- trunk/plexus-component-api/debian/maven.rules (rev 0)
+++ trunk/plexus-component-api/debian/maven.rules 2011-08-26 09:05:44 UTC (rev 14498)
@@ -0,0 +1,19 @@
+# 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/
+
+org.codehaus.plexus plexus-component-api jar s/.*/debian/ * *
Added: trunk/plexus-component-api/debian/patches/0001-add-version-to-plexus-classworlds.patch
===================================================================
--- trunk/plexus-component-api/debian/patches/0001-add-version-to-plexus-classworlds.patch (rev 0)
+++ trunk/plexus-component-api/debian/patches/0001-add-version-to-plexus-classworlds.patch 2011-08-26 09:05:44 UTC (rev 14498)
@@ -0,0 +1,28 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Fri, 26 Aug 2011 11:00:10 +0200
+Subject: [PATCH] add version to plexus-classworlds
+
+---
+ pom.xml | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c41864a..c809a2e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -26,6 +26,7 @@
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
++ <version>1.2-alpha-7</version>
+ </dependency>
+ </dependencies>
+
+@@ -58,4 +59,4 @@
+ </plugin>
+ </plugins>
+ </reporting>
+-</project>
+\ No newline at end of file
++</project>
+--
Added: trunk/plexus-component-api/debian/patches/series
===================================================================
--- trunk/plexus-component-api/debian/patches/series (rev 0)
+++ trunk/plexus-component-api/debian/patches/series 2011-08-26 09:05:44 UTC (rev 14498)
@@ -0,0 +1 @@
+0001-add-version-to-plexus-classworlds.patch
Modified: trunk/plexus-component-api/debian/rules
===================================================================
--- trunk/plexus-component-api/debian/rules 2011-08-26 08:46:09 UTC (rev 14497)
+++ trunk/plexus-component-api/debian/rules 2011-08-26 09:05:44 UTC (rev 14498)
@@ -1,31 +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 := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-#VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
-VERSION := "1.0-alpha-22"
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 /usr/share/java/plexus-classworlds.jar
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-#DEB_ANT_INVOKE := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
-API_DOCS := build/doc/api
+JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-makebuilddir/lib$(PACKAGE)-java-doc::
- echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install
-
-cleanbuilddir/lib$(PACKAGE)-java-doc::
- cd debian && rm -f lib$(PACKAGE)-java-doc.install
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) pom.xml build/$(PACKAGE)-$(VERSION).jar
-
-clean::
- -rm -rf debian/tmp
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list