Author: twerner Date: 2011-09-22 19:27:14 +0000 (Thu, 22 Sep 2011) New Revision: 15006
Added: trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.doc-base.api trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.install trunk/plexus-maven-plugin/debian/maven.cleanIgnoreRules trunk/plexus-maven-plugin/debian/maven.ignoreRules trunk/plexus-maven-plugin/debian/maven.properties trunk/plexus-maven-plugin/debian/maven.publishedRules trunk/plexus-maven-plugin/debian/patches/0001-support-newer-doxia.patch trunk/plexus-maven-plugin/debian/patches/0002-fix-plexus-descriptor.patch trunk/plexus-maven-plugin/debian/patches/0003-add-missing-dependency.patch trunk/plexus-maven-plugin/debian/patches/0004-set-source-and-target-version.patch Removed: trunk/plexus-maven-plugin/debian/build.properties trunk/plexus-maven-plugin/debian/maven-settings.xml trunk/plexus-maven-plugin/debian/patches/descriptor.diff trunk/plexus-maven-plugin/debian/patches/doxia.diff trunk/plexus-maven-plugin/debian/patches/pom.diff Modified: trunk/plexus-maven-plugin/debian/README.source trunk/plexus-maven-plugin/debian/changelog trunk/plexus-maven-plugin/debian/control trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java.poms trunk/plexus-maven-plugin/debian/maven.rules trunk/plexus-maven-plugin/debian/orig-tar.sh trunk/plexus-maven-plugin/debian/patches/series trunk/plexus-maven-plugin/debian/rules trunk/plexus-maven-plugin/debian/watch Log: * Use Maven to build the package. * Add a documentation package. Modified: trunk/plexus-maven-plugin/debian/README.source =================================================================== --- trunk/plexus-maven-plugin/debian/README.source 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/README.source 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,6 +1,9 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. +Information about plexus-maven-plugin +------------------------------------- -See /usr/share/doc/quilt/README.source for a detailed explanation. +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-maven-plugin/debian/build.properties =================================================================== --- trunk/plexus-maven-plugin/debian/build.properties 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/build.properties 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,4 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true -maven.generate.target=plugin:descriptor Modified: trunk/plexus-maven-plugin/debian/changelog =================================================================== --- trunk/plexus-maven-plugin/debian/changelog 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/changelog 2011-09-22 19:27:14 UTC (rev 15006) @@ -2,8 +2,10 @@ * Switch to source format 3.0. * Update Standards-Version: 3.9.2. + * Use Maven to build the package. + * Add a documentation package. - -- Torsten Werner <[email protected]> Thu, 22 Sep 2011 21:06:16 +0200 + -- Torsten Werner <[email protected]> Thu, 22 Sep 2011 21:23:30 +0200 plexus-maven-plugin (1.3.8-6) unstable; urgency=low Modified: trunk/plexus-maven-plugin/debian/control =================================================================== --- trunk/plexus-maven-plugin/debian/control 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/control 2011-09-22 19:27:14 UTC (rev 15006) @@ -3,19 +3,20 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, - junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity, - libplexus-cdc-java (>= 1.0~alpha14-4), libslf4j-java, libmaven-reporting-impl-java +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libmaven-javadoc-plugin-java, libmaven-plugin-tools-java, libmaven-reporting-impl-java, + libmaven2-core-java, libplexus-cdc-java, libslf4j-java, default-jdk-doc, + libmaven-reporting-impl-java-doc, libmaven2-core-java-doc Standards-Version: 3.9.2 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-maven-helper/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-maven-helper/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-maven-plugin +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-maven-plugin Homepage: http://plexus.codehaus.org/plexus-maven-plugin/ Package: libplexus-maven-plugin-java Architecture: all -Depends: ${misc:Depends}, libplexus-cdc-java (>= 1.0~alpha14-4), - libslf4j-java, libmaven-reporting-impl-java +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libplexus-maven-plugin-java-doc Description: Maven plugin for the Plexus Component Descriptor Creator The Plexus project provides a full software stack for creating and executing software projects. Based on the Plexus container, the applications @@ -28,3 +29,21 @@ . This package ships a Maven plugin to automatically generate the component descriptor file during the build process. + +Package: libplexus-maven-plugin-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libplexus-maven-plugin-java +Description: Documentation for Plexus Maven Plugin + The Plexus project provides a full software stack for creating and + executing software projects. Based on the Plexus container, the applications + can utilise component-oriented programming to build modular, reusable + components that can easily be assembled and reused. + . + The Component Descriptor Creator (or CDC for short) is a tool that will create + the components.xml file from your Java code. It uses JavaDoc tags to gather the + information it needs to create the component descriptor. + . + This package contains the API documentation of libplexus-maven-plugin-java. Added: trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.doc-base.api =================================================================== --- trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.doc-base.api (rev 0) +++ trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.doc-base.api 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,10 @@ +Document: libplexus-maven-plugin-java +Title: API Javadoc for Plexus Maven Plugin +Author: Plexus Maven Plugin developers +Abstract: This is the API Javadoc provided for the + libplexus-maven-plugin-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libplexus-maven-plugin-java/api/index.html +Files: /usr/share/doc/libplexus-maven-plugin-java/api/* Added: trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.install =================================================================== --- trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.install (rev 0) +++ trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java-doc.install 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libplexus-maven-plugin-java/api + Modified: trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java.poms =================================================================== --- trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java.poms 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/libplexus-maven-plugin-java.poms 2011-09-22 19:27:14 UTC (rev 15006) @@ -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 Deleted: trunk/plexus-maven-plugin/debian/maven-settings.xml =================================================================== --- trunk/plexus-maven-plugin/debian/maven-settings.xml 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/maven-settings.xml 2011-09-22 19:27:14 UTC (rev 15006) @@ -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/plexus-maven-plugin/debian/maven.cleanIgnoreRules =================================================================== --- trunk/plexus-maven-plugin/debian/maven.cleanIgnoreRules (rev 0) +++ trunk/plexus-maven-plugin/debian/maven.cleanIgnoreRules 2011-09-22 19:27:14 UTC (rev 15006) @@ -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-maven-plugin/debian/maven.ignoreRules =================================================================== --- trunk/plexus-maven-plugin/debian/maven.ignoreRules (rev 0) +++ trunk/plexus-maven-plugin/debian/maven.ignoreRules 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,17 @@ +# 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/ + +org.apache.maven.plugins maven-jxr-plugin * * * * Added: trunk/plexus-maven-plugin/debian/maven.properties =================================================================== --- trunk/plexus-maven-plugin/debian/maven.properties (rev 0) +++ trunk/plexus-maven-plugin/debian/maven.properties 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + Added: trunk/plexus-maven-plugin/debian/maven.publishedRules =================================================================== --- trunk/plexus-maven-plugin/debian/maven.publishedRules (rev 0) +++ trunk/plexus-maven-plugin/debian/maven.publishedRules 2011-09-22 19:27:14 UTC (rev 15006) @@ -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/plexus-maven-plugin/debian/maven.rules =================================================================== --- trunk/plexus-maven-plugin/debian/maven.rules 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/maven.rules 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,3 +1,19 @@ -# keep the version for all Maven plugins as versionless plugins don't work -* * maven-plugin * -junit junit jar s/3\..*/3.x/ \ No newline at end of file +# 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.apache.maven.reporting maven-reporting-impl jar s/.*/debian/ * * Modified: trunk/plexus-maven-plugin/debian/orig-tar.sh =================================================================== --- trunk/plexus-maven-plugin/debian/orig-tar.sh 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/orig-tar.sh 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,16 +1,16 @@ #!/bin/sh -e -TAR=../plexus-maven-plugin_$2.orig.tar.gz -DIR=plexus-maven-plugin-$2 -TAG=plexus-maven-plugin-$2 +VERSION=$2 +TAR=../plexus-maven-plugin_$VERSION.orig.tar.gz +DIR=plexus-maven-plugin-$VERSION +TAG=$(echo "plexus-maven-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') -svn export http://svn.codehaus.org/plexus/archive/plexus-maven-plugin/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +svn export http://svn.codehaus.org/plexus/plexus-maven-plugin/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 Copied: trunk/plexus-maven-plugin/debian/patches/0001-support-newer-doxia.patch (from rev 15004, trunk/plexus-maven-plugin/debian/patches/doxia.diff) =================================================================== --- trunk/plexus-maven-plugin/debian/patches/0001-support-newer-doxia.patch (rev 0) +++ trunk/plexus-maven-plugin/debian/patches/0001-support-newer-doxia.patch 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,130 @@ +From: Debian Java Maintainers <[email protected]> +Date: Thu, 22 Sep 2011 21:18:05 +0200 +Subject: support newer doxia + +see http://jira.codehaus.org/browse/PLX-404 +--- + .../maven/plugin/PlexusComponentsReport.java | 10 +++++----- + .../plexus/maven/plugin/report/Component.java | 2 +- + .../plexus/maven/plugin/report/ComponentSet.java | 2 +- + .../plexus/maven/plugin/report/Components.java | 2 +- + .../plexus/maven/plugin/report/Configuration.java | 2 +- + .../plexus/maven/plugin/report/Requirement.java | 2 +- + .../plexus/maven/plugin/report/Requirements.java | 2 +- + 7 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java +index 4485c27..9636a77 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java +@@ -31,8 +31,8 @@ import java.util.Locale; + import org.apache.maven.project.MavenProject; + import org.apache.maven.reporting.AbstractMavenReport; + import org.apache.maven.reporting.MavenReportException; +-import org.codehaus.doxia.sink.Sink; +-import org.codehaus.doxia.site.renderer.SiteRenderer; ++import org.apache.maven.doxia.sink.Sink; ++import org.apache.maven.doxia.siterenderer.Renderer; + import org.codehaus.plexus.maven.plugin.report.ComponentSet; + import org.jdom.Document; + import org.jdom.JDOMException; +@@ -62,9 +62,9 @@ public class PlexusComponentsReport + private MavenProject project; + + /** +- * @component org.codehaus.doxia.site.renderer.SiteRenderer ++ * @component org.codehaus.doxia.siterenderer.Renderer + */ +- private SiteRenderer siteRenderer; ++ private Renderer siteRenderer; + + /** + * @parameter expression="${project.reporting.outputDirectory} +@@ -114,7 +114,7 @@ public class PlexusComponentsReport + return project; + } + +- protected SiteRenderer getSiteRenderer() ++ protected Renderer getSiteRenderer() + { + return siteRenderer; + } +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java +index 675d043..ab5a5bf 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java +@@ -19,7 +19,7 @@ package org.codehaus.plexus.maven.plugin.report; + import java.util.Iterator; + import java.util.List; + +-import org.codehaus.doxia.sink.Sink; ++import org.apache.maven.doxia.sink.Sink; + import org.codehaus.plexus.util.StringUtils; + import org.jdom.Element; + +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java +index 167b1df..69c5d02 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java +@@ -17,7 +17,7 @@ package org.codehaus.plexus.maven.plugin.report; + */ + import java.util.List; + +-import org.codehaus.doxia.sink.Sink; ++import org.apache.maven.doxia.sink.Sink; + import org.jdom.Element; + + /** +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java +index d865971..aeefa9a 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java +@@ -25,7 +25,7 @@ import java.util.SortedSet; + import java.util.TreeMap; + import java.util.TreeSet; + +-import org.codehaus.doxia.sink.Sink; ++import org.apache.maven.doxia.sink.Sink; + import org.jdom.Element; + + /** +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java +index 835c89d..63272d4 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java +@@ -24,7 +24,7 @@ + + package org.codehaus.plexus.maven.plugin.report; + +-import org.codehaus.doxia.sink.Sink; ++import org.apache.maven.doxia.sink.Sink; + import org.jdom.Element; + + /** +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java +index ae29488..c315060 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java +@@ -24,7 +24,7 @@ + + package org.codehaus.plexus.maven.plugin.report; + +-import org.codehaus.doxia.sink.Sink; ++import org.apache.maven.doxia.sink.Sink; + import org.codehaus.plexus.util.StringUtils; + import org.jdom.Element; + +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java +index d1c06a6..fb7e62a 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java +@@ -28,7 +28,7 @@ import java.util.ArrayList; + import java.util.Iterator; + import java.util.List; + +-import org.codehaus.doxia.sink.Sink; ++import org.apache.maven.doxia.sink.Sink; + import org.jdom.Element; + + /** +-- Copied: trunk/plexus-maven-plugin/debian/patches/0002-fix-plexus-descriptor.patch (from rev 15004, trunk/plexus-maven-plugin/debian/patches/descriptor.diff) =================================================================== --- trunk/plexus-maven-plugin/debian/patches/0002-fix-plexus-descriptor.patch (rev 0) +++ trunk/plexus-maven-plugin/debian/patches/0002-fix-plexus-descriptor.patch 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,56 @@ +From: Debian Java Maintainers <[email protected]> +Date: Thu, 22 Sep 2011 21:18:05 +0200 +Subject: fix plexus descriptor + +--- + .../maven/plugin/AbstractDescriptorMojo.java | 4 ++-- + .../plexus/maven/plugin/AbstractMergeMojo.java | 2 +- + .../maven/plugin/PlexusComponentsReport.java | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java +index cbab36e..1901df4 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java +@@ -88,12 +88,12 @@ public abstract class AbstractDescriptorMojo + private ComponentDescriptorExtractor[] extractors; + + /** +- * @component ++ * @component role="org.codehaus.plexus.cdc.ComponentDescriptorWriter" + */ + private ComponentDescriptorWriter writer; + + /** +- * @component ++ * @component role="org.apache.maven.project.MavenProjectHelper" + */ + private MavenProjectHelper mavenProjectHelper; + +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java +index 0ab2e7c..3584683 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java +@@ -65,7 +65,7 @@ public abstract class AbstractMergeMojo + // ---------------------------------------------------------------------- + + /** +- * @component ++ * @component role="org.codehaus.plexus.cdc.ComponentDescriptorCreator" + */ + private ComponentDescriptorCreator cdc; + +diff --git a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java +index 9636a77..de69d28 100644 +--- a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java +@@ -62,7 +62,7 @@ public class PlexusComponentsReport + private MavenProject project; + + /** +- * @component org.codehaus.doxia.siterenderer.Renderer ++ * @component role="org.codehaus.doxia.siterenderer.Renderer" + */ + private Renderer siteRenderer; + +-- Copied: trunk/plexus-maven-plugin/debian/patches/0003-add-missing-dependency.patch (from rev 15004, trunk/plexus-maven-plugin/debian/patches/pom.diff) =================================================================== --- trunk/plexus-maven-plugin/debian/patches/0003-add-missing-dependency.patch (rev 0) +++ trunk/plexus-maven-plugin/debian/patches/0003-add-missing-dependency.patch 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,25 @@ +From: Debian Java Maintainers <[email protected]> +Date: Thu, 22 Sep 2011 21:18:05 +0200 +Subject: add missing dependency + +--- + pom.xml | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 6f98e38..1c92109 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -65,6 +65,11 @@ + <artifactId>plexus-cdc</artifactId> + <version>1.0-alpha-13</version> + </dependency> ++ <dependency> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-utils</artifactId> ++ <version>1.5.8</version> ++ </dependency> + </dependencies> + + <scm> +-- Added: trunk/plexus-maven-plugin/debian/patches/0004-set-source-and-target-version.patch =================================================================== --- trunk/plexus-maven-plugin/debian/patches/0004-set-source-and-target-version.patch (rev 0) +++ trunk/plexus-maven-plugin/debian/patches/0004-set-source-and-target-version.patch 2011-09-22 19:27:14 UTC (rev 15006) @@ -0,0 +1,33 @@ +From: Torsten Werner <[email protected]> +Date: Thu, 22 Sep 2011 21:21:35 +0200 +Subject: set source and target version + +--- + pom.xml | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 1c92109..c793236 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -72,6 +72,19 @@ + </dependency> + </dependencies> + ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <configuration> ++ <source>1.5</source> ++ <target>1.5</target> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++ + <scm> + <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.8</connection> + <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.8</developerConnection> +-- Deleted: trunk/plexus-maven-plugin/debian/patches/descriptor.diff =================================================================== --- trunk/plexus-maven-plugin/debian/patches/descriptor.diff 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/patches/descriptor.diff 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,39 +0,0 @@ ---- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java -@@ -88,12 +88,12 @@ - private ComponentDescriptorExtractor[] extractors; - - /** -- * @component -+ * @component role="org.codehaus.plexus.cdc.ComponentDescriptorWriter" - */ - private ComponentDescriptorWriter writer; - - /** -- * @component -+ * @component role="org.apache.maven.project.MavenProjectHelper" - */ - private MavenProjectHelper mavenProjectHelper; - ---- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractMergeMojo.java -@@ -65,7 +65,7 @@ - // ---------------------------------------------------------------------- - - /** -- * @component -+ * @component role="org.codehaus.plexus.cdc.ComponentDescriptorCreator" - */ - private ComponentDescriptorCreator cdc; - ---- a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java -@@ -62,7 +62,7 @@ - private MavenProject project; - - /** -- * @component org.codehaus.doxia.siterenderer.Renderer -+ * @component role="org.codehaus.doxia.siterenderer.Renderer" - */ - private Renderer siteRenderer; - Deleted: trunk/plexus-maven-plugin/debian/patches/doxia.diff =================================================================== --- trunk/plexus-maven-plugin/debian/patches/doxia.diff 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/patches/doxia.diff 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,102 +0,0 @@ -see http://jira.codehaus.org/browse/PLX-404 - ---- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java -@@ -19,7 +19,7 @@ - import java.util.Iterator; - import java.util.List; - --import org.codehaus.doxia.sink.Sink; -+import org.apache.maven.doxia.sink.Sink; - import org.codehaus.plexus.util.StringUtils; - import org.jdom.Element; - ---- a/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java -@@ -17,7 +17,7 @@ - */ - import java.util.List; - --import org.codehaus.doxia.sink.Sink; -+import org.apache.maven.doxia.sink.Sink; - import org.jdom.Element; - - /** ---- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java -@@ -25,7 +25,7 @@ - import java.util.TreeMap; - import java.util.TreeSet; - --import org.codehaus.doxia.sink.Sink; -+import org.apache.maven.doxia.sink.Sink; - import org.jdom.Element; - - /** ---- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java -@@ -24,7 +24,7 @@ - - package org.codehaus.plexus.maven.plugin.report; - --import org.codehaus.doxia.sink.Sink; -+import org.apache.maven.doxia.sink.Sink; - import org.jdom.Element; - - /** ---- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java -@@ -24,7 +24,7 @@ - - package org.codehaus.plexus.maven.plugin.report; - --import org.codehaus.doxia.sink.Sink; -+import org.apache.maven.doxia.sink.Sink; - import org.codehaus.plexus.util.StringUtils; - import org.jdom.Element; - ---- a/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java -@@ -28,7 +28,7 @@ - import java.util.Iterator; - import java.util.List; - --import org.codehaus.doxia.sink.Sink; -+import org.apache.maven.doxia.sink.Sink; - import org.jdom.Element; - - /** ---- a/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java -+++ b/src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java -@@ -31,8 +31,8 @@ - import org.apache.maven.project.MavenProject; - import org.apache.maven.reporting.AbstractMavenReport; - import org.apache.maven.reporting.MavenReportException; --import org.codehaus.doxia.sink.Sink; --import org.codehaus.doxia.site.renderer.SiteRenderer; -+import org.apache.maven.doxia.sink.Sink; -+import org.apache.maven.doxia.siterenderer.Renderer; - import org.codehaus.plexus.maven.plugin.report.ComponentSet; - import org.jdom.Document; - import org.jdom.JDOMException; -@@ -62,9 +62,9 @@ - private MavenProject project; - - /** -- * @component org.codehaus.doxia.site.renderer.SiteRenderer -+ * @component org.codehaus.doxia.siterenderer.Renderer - */ -- private SiteRenderer siteRenderer; -+ private Renderer siteRenderer; - - /** - * @parameter expression="${project.reporting.outputDirectory} -@@ -114,7 +114,7 @@ - return project; - } - -- protected SiteRenderer getSiteRenderer() -+ protected Renderer getSiteRenderer() - { - return siteRenderer; - } Deleted: trunk/plexus-maven-plugin/debian/patches/pom.diff =================================================================== --- trunk/plexus-maven-plugin/debian/patches/pom.diff 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/patches/pom.diff 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,14 +0,0 @@ ---- a/pom.xml -+++ b/pom.xml -@@ -65,6 +65,11 @@ - <artifactId>plexus-cdc</artifactId> - <version>1.0-alpha-13</version> - </dependency> -+ <dependency> -+ <groupId>org.codehaus.plexus</groupId> -+ <artifactId>plexus-utils</artifactId> -+ <version>1.5.8</version> -+ </dependency> - </dependencies> - - <scm> Modified: trunk/plexus-maven-plugin/debian/patches/series =================================================================== --- trunk/plexus-maven-plugin/debian/patches/series 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/patches/series 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,3 +1,4 @@ -doxia.diff -descriptor.diff -pom.diff +0001-support-newer-doxia.patch +0002-fix-plexus-descriptor.patch +0003-add-missing-dependency.patch +0004-set-source-and-target-version.patch Modified: trunk/plexus-maven-plugin/debian/rules =================================================================== --- trunk/plexus-maven-plugin/debian/rules 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/rules 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,25 +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-project maven-artifact maven-artifact-manager \ - maven-reporting-api maven-reporting-impl slf4j-api slf4j-simple plexus-cdc plexus-utils qdox jdom1 doxia-core \ - doxia-logging-api doxia-sink-api doxia-decoration-model doxia-site-renderer -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/plexus-maven-plugin/debian/watch =================================================================== --- trunk/plexus-maven-plugin/debian/watch 2011-09-22 19:06:23 UTC (rev 15005) +++ trunk/plexus-maven-plugin/debian/watch 2011-09-22 19:27:14 UTC (rev 15006) @@ -1,3 +1,4 @@ version=3 -http://svn.codehaus.org/plexus/archive/plexus-maven-plugin/tags/ \ - plexus-maven-plugin-(.*)/ debian debian/orig-tar.sh +opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ + http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/ \ + plexus-maven-plugin-(\d.*)/ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
