This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-maven-plugin.
commit 8b16e73cee85df35c57078f6600d8cc69150b4ce Author: Torsten Werner <[email protected]> Date: Thu Sep 22 19:27:14 2011 +0000 * Use Maven to build the package. * Add a documentation package. --- debian/README.source | 11 ++- debian/build.properties | 4 - debian/changelog | 4 +- debian/control | 35 +++++-- .../libplexus-maven-plugin-java-doc.doc-base.api | 10 ++ debian/libplexus-maven-plugin-java-doc.install | 2 + debian/libplexus-maven-plugin-java.poms | 27 +++++- debian/maven-settings.xml | 9 -- debian/maven.cleanIgnoreRules | 17 ++++ debian/maven.ignoreRules | 17 ++++ debian/maven.properties | 4 + debian/maven.publishedRules | 19 ++++ debian/maven.rules | 22 ++++- debian/orig-tar.sh | 14 +-- .../{doxia.diff => 0001-support-newer-doxia.patch} | 104 +++++++++++++-------- ...iptor.diff => 0002-fix-plexus-descriptor.patch} | 23 ++++- ...{pom.diff => 0003-add-missing-dependency.patch} | 11 +++ .../0004-set-source-and-target-version.patch | 33 +++++++ debian/patches/series | 7 +- debian/rules | 22 +---- debian/watch | 5 +- 21 files changed, 298 insertions(+), 102 deletions(-) diff --git a/debian/README.source b/debian/README.source index 7df3fd2..e8a5477 100644 --- a/debian/README.source +++ b/debian/README.source @@ -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. diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 087f536..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true -maven.generate.target=plugin:descriptor diff --git a/debian/changelog b/debian/changelog index fd19e96..c797840 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ plexus-maven-plugin (1.3.8-7) unstable; urgency=low * 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 diff --git a/debian/control b/debian/control index 2b7a506..267a910 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,20 @@ Section: java 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 @@ Description: Maven plugin for the Plexus Component Descriptor Creator . 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. diff --git a/debian/libplexus-maven-plugin-java-doc.doc-base.api b/debian/libplexus-maven-plugin-java-doc.doc-base.api new file mode 100644 index 0000000..f8b8fd5 --- /dev/null +++ b/debian/libplexus-maven-plugin-java-doc.doc-base.api @@ -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/* diff --git a/debian/libplexus-maven-plugin-java-doc.install b/debian/libplexus-maven-plugin-java-doc.install new file mode 100644 index 0000000..5d47ad1 --- /dev/null +++ b/debian/libplexus-maven-plugin-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libplexus-maven-plugin-java/api + diff --git a/debian/libplexus-maven-plugin-java.poms b/debian/libplexus-maven-plugin-java.poms index 43e746b..31a0ccf 100644 --- a/debian/libplexus-maven-plugin-java.poms +++ b/debian/libplexus-maven-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-settings.xml b/debian/maven-settings.xml deleted file mode 100644 index 01f8769..0000000 --- a/debian/maven-settings.xml +++ /dev/null @@ -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> 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..2bff744 --- /dev/null +++ b/debian/maven.ignoreRules @@ -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 * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..7c29bd7 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=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 ac93f22..22aca7b 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -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/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 2aea1ec..d60cb5e 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -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 diff --git a/debian/patches/doxia.diff b/debian/patches/0001-support-newer-doxia.patch similarity index 57% rename from debian/patches/doxia.diff rename to debian/patches/0001-support-newer-doxia.patch index 7569055..67c7ecd 100644 --- a/debian/patches/doxia.diff +++ b/debian/patches/0001-support-newer-doxia.patch @@ -1,8 +1,59 @@ +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 @@ +@@ -19,7 +19,7 @@ package org.codehaus.plexus.maven.plugin.report; import java.util.Iterator; import java.util.List; @@ -11,9 +62,11 @@ see http://jira.codehaus.org/browse/PLX-404 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 @@ +@@ -17,7 +17,7 @@ package org.codehaus.plexus.maven.plugin.report; */ import java.util.List; @@ -22,9 +75,11 @@ see http://jira.codehaus.org/browse/PLX-404 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 @@ +@@ -25,7 +25,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; @@ -33,6 +88,8 @@ see http://jira.codehaus.org/browse/PLX-404 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 @@ @@ -44,6 +101,8 @@ see http://jira.codehaus.org/browse/PLX-404 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 @@ @@ -55,9 +114,11 @@ see http://jira.codehaus.org/browse/PLX-404 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 @@ +@@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -66,37 +127,4 @@ see http://jira.codehaus.org/browse/PLX-404 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; - } +-- diff --git a/debian/patches/descriptor.diff b/debian/patches/0002-fix-plexus-descriptor.patch similarity index 53% rename from debian/patches/descriptor.diff rename to debian/patches/0002-fix-plexus-descriptor.patch index 40624ba..c969b76 100644 --- a/debian/patches/descriptor.diff +++ b/debian/patches/0002-fix-plexus-descriptor.patch @@ -1,6 +1,18 @@ +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 @@ +@@ -88,12 +88,12 @@ public abstract class AbstractDescriptorMojo private ComponentDescriptorExtractor[] extractors; /** @@ -15,9 +27,11 @@ */ 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 @@ +@@ -65,7 +65,7 @@ public abstract class AbstractMergeMojo // ---------------------------------------------------------------------- /** @@ -26,9 +40,11 @@ */ 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 @@ +@@ -62,7 +62,7 @@ public class PlexusComponentsReport private MavenProject project; /** @@ -37,3 +53,4 @@ */ private Renderer siteRenderer; +-- diff --git a/debian/patches/pom.diff b/debian/patches/0003-add-missing-dependency.patch similarity index 56% rename from debian/patches/pom.diff rename to debian/patches/0003-add-missing-dependency.patch index b01385d..a13d2a9 100644 --- a/debian/patches/pom.diff +++ b/debian/patches/0003-add-missing-dependency.patch @@ -1,3 +1,13 @@ +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 @@ @@ -12,3 +22,4 @@ </dependencies> <scm> +-- diff --git a/debian/patches/0004-set-source-and-target-version.patch b/debian/patches/0004-set-source-and-target-version.patch new file mode 100644 index 0000000..11fd859 --- /dev/null +++ b/debian/patches/0004-set-source-and-target-version.patch @@ -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> +-- diff --git a/debian/patches/series b/debian/patches/series index 84d7888..0738234 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 diff --git a/debian/rules b/debian/rules index ad1c01c..b76c54a 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/debian/watch b/debian/watch index f1cac9b..fb7ea39 100644 --- a/debian/watch +++ b/debian/watch @@ -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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-maven-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
