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 19e127e2722a77b1a1c0c3f4b3c9b833e974a08f Author: Ludovic Claude <[email protected]> Date: Wed Jul 8 23:54:05 2009 +0000 * Change section to java, bump up Standards-Version to 3.8.1 * Add a Build-Depends-Indep dependency on maven-repo-helper * Use mh_installpom and mh_installjar to install the POM and the jar to the Maven repository * Remove the patch for the POM as it's no longer needed * Change the build dependency on openjdk-6-jdk to default-jdk * Use cdbs-ant instead of cdbs-maven for the build, as this plugin is used to build Maven or some of its build dependencies. * Remove the dependencies on Java runtimes as it is a library. --- debian/build.properties | 4 ++ debian/changelog | 14 +++++ debian/compat | 2 +- debian/control | 10 ++-- debian/libplexus-maven-plugin-java.poms | 1 + debian/maven-settings.xml | 9 ++++ debian/maven.rules | 3 ++ debian/patches/descriptor.diff | 11 ++++ debian/patches/doxia.diff | 90 ++++++++++++++------------------- debian/patches/pom.diff | 79 +++-------------------------- debian/patches/series | 3 +- debian/rules | 22 ++++++-- 12 files changed, 114 insertions(+), 134 deletions(-) diff --git a/debian/build.properties b/debian/build.properties new file mode 100644 index 0000000..087f536 --- /dev/null +++ b/debian/build.properties @@ -0,0 +1,4 @@ +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 7a2be44..dc71687 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +plexus-maven-plugin (1.3.8-3) unstable; urgency=low + + * Change section to java, bump up Standards-Version to 3.8.1 + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Remove the patch for the POM as it's no longer needed + * Change the build dependency on openjdk-6-jdk to default-jdk + * Use cdbs-ant instead of cdbs-maven for the build, as this plugin is used + to build Maven or some of its build dependencies. + * Remove the dependencies on Java runtimes as it is a library. + + -- Ludovic Claude <[email protected]> Sun, 17 May 2009 16:07:37 +0100 + plexus-maven-plugin (1.3.8-2) unstable; urgency=low * Change Depends: default-java to default-jre. diff --git a/debian/compat b/debian/compat index 7ed6ff8..1e8b314 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +6 diff --git a/debian/control b/debian/control index 01b9f21..b9c3873 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,20 @@ Source: plexus-maven-plugin -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven-debian-helper, +Build-Depends: debhelper (>= 6), cdbs, default-jdk, quilt +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, libslf4j-java, libmaven-reporting-impl-java -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 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/ Homepage: http://plexus.codehaus.org/plexus-maven-plugin/ Package: libplexus-maven-plugin-java Architecture: all -Depends: ${misc:Depends}, default-jre | java2-runtime, libplexus-cdc-java, +Depends: ${misc:Depends}, libplexus-cdc-java, libslf4j-java, libmaven-reporting-impl-java Description: Maven plugin for the Plexus Component Descriptor Creator The Plexus project provides a full software stack for creating and diff --git a/debian/libplexus-maven-plugin-java.poms b/debian/libplexus-maven-plugin-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libplexus-maven-plugin-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml new file mode 100644 index 0000000..01f8769 --- /dev/null +++ b/debian/maven-settings.xml @@ -0,0 +1,9 @@ +<!-- + 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.rules b/debian/maven.rules new file mode 100644 index 0000000..ac93f22 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,3 @@ +# 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 diff --git a/debian/patches/descriptor.diff b/debian/patches/descriptor.diff new file mode 100644 index 0000000..247ec10 --- /dev/null +++ b/debian/patches/descriptor.diff @@ -0,0 +1,11 @@ +--- a/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java ++++ b/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java +@@ -88,7 +88,7 @@ + private ComponentDescriptorExtractor[] extractors; + + /** +- * @component ++ * @component role="org.codehaus.plexus.cdc.ComponentDescriptorWriter" + */ + private ComponentDescriptorWriter writer; + diff --git a/debian/patches/doxia.diff b/debian/patches/doxia.diff index 950f60b..7569055 100644 --- a/debian/patches/doxia.diff +++ b/debian/patches/doxia.diff @@ -1,46 +1,8 @@ see http://jira.codehaus.org/browse/PLX-404 -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..14a2f5e 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.apache.maven.doxia.siterenderer.DefaultSiteRenderer - */ -- 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; +@@ -19,7 +19,7 @@ import java.util.Iterator; import java.util.List; @@ -49,11 +11,9 @@ index 675d043..ab5a5bf 100644 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; +@@ -17,7 +17,7 @@ */ import java.util.List; @@ -62,11 +22,9 @@ index 167b1df..69c5d02 100644 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; +@@ -25,7 +25,7 @@ import java.util.TreeMap; import java.util.TreeSet; @@ -75,8 +33,6 @@ index d865971..aeefa9a 100644 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 @@ @@ -88,8 +44,6 @@ index 835c89d..63272d4 100644 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 @@ @@ -101,11 +55,9 @@ index ae29488..c315060 100644 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; +@@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.List; @@ -114,3 +66,37 @@ index d1c06a6..fb7e62a 100644 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/pom.diff b/debian/patches/pom.diff index 0b088e2..b01385d 100644 --- a/debian/patches/pom.diff +++ b/debian/patches/pom.diff @@ -1,81 +1,14 @@ -diff --git a/pom.xml b/pom.xml -index 6f98e38..66e13ab 100644 --- a/pom.xml +++ b/pom.xml -@@ -7,7 +7,7 @@ - <parent> - <artifactId>plexus</artifactId> - <groupId>org.codehaus.plexus</groupId> -- <version>1.0.10</version> -+ <version>1.0.13</version> - </parent> - - <modelVersion>4.0.0</modelVersion> -@@ -33,15 +33,27 @@ - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> -- <version>1.4.3</version> -+ <version>1.5.2</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/slf4j-api.jar</systemPath> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> -- <version>1.4.3</version> -+ <version>1.5.2</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/slf4j-simple.jar</systemPath> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> -+ <artifactId>maven-core</artifactId> -+ <version>2.0.9</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/maven2.jar</systemPath> -+ </dependency> -+ <!-- -+ <dependency> -+ <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.5</version> - </dependency> -@@ -54,17 +66,34 @@ - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - <version>2.0</version> -- </dependency> -+ </dependency> -+ --> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> -- <version>2.0</version> -+ <version>2.0.4.1</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/maven-reporting-impl.jar</systemPath> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> +@@ -65,6 +65,11 @@ <artifactId>plexus-cdc</artifactId> -- <version>1.0-alpha-13</version> -+ <version>${org.codehaus.plexus.plexus-cdc.version}</version> + <version>1.0-alpha-13</version> </dependency> + <dependency> -+ <groupId>org.apache.maven.doxia</groupId> -+ <artifactId>doxia-sink-api</artifactId> -+ <version>1.0-alpha-11</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/doxia-sink-api.jar</systemPath> -+ </dependency> -+ <dependency> -+ <groupId>org.apache.maven.doxia</groupId> -+ <artifactId>doxia-site-renderer</artifactId> -+ <version>1.0-alpha-11</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/doxia-site-renderer.jar</systemPath> -+ </dependency> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-utils</artifactId> ++ <version>1.5.8</version> ++ </dependency> </dependencies> <scm> diff --git a/debian/patches/series b/debian/patches/series index 225539b..84d7888 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ -pom.diff doxia.diff +descriptor.diff +pom.diff diff --git a/debian/rules b/debian/rules index b23788c..8bbf57d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,26 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk +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 get-orig-source: - uscan --force-download --rename + -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 -- 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
