[pkg-java] r11906 - in trunk/maven-doxia-tools/debian: . patches

Sat Mar 20 23:04:10 UTC 2010

Author: drazzib
Date: 2010-03-20 23:04:05 +0000 (Sat, 20 Mar 2010)
New Revision: 11906

Modified:
   trunk/maven-doxia-tools/debian/build.properties
   trunk/maven-doxia-tools/debian/changelog
   trunk/maven-doxia-tools/debian/control
   trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
   trunk/maven-doxia-tools/debian/patches/setLastModified.diff
   trunk/maven-doxia-tools/debian/rules
Log:
* Add myself as Uploaders
* Replace usage of outdated libplexus-component-metadata-java by
  libplexus-maven-plugin-java (to generate Plexus component.xml):
  - debian/control: Build-Depends on libplexus-maven-plugin-java,
    velocity and libplexus-velocity-java
  - debian/rules: Pass "1.3.8" to build.xml as plexus-maven-plugin.version
  - debian/build.properties: Use plexus-maven-plugin:descriptor goal
  This should fix issue "Component descriptor cannot be found in the
  component repository: org.apache.maven.artifact.resolver.ArtifactResolver"
  when using maven-site-plugin.

Modified: trunk/maven-doxia-tools/debian/build.properties
===================================================================

--- trunk/maven-doxia-tools/debian/build.properties	2010-03-20 23:00:53 UTC (rev 11905)
+++ trunk/maven-doxia-tools/debian/build.properties	2010-03-20 23:04:05 UTC (rev 11906)
@@ -1,4 +1,4 @@
 javadoc.dir=target/api
 build.directory=target
 maven.test.skip=true
-maven.generate.target=org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata
+maven.generate.target=org.codehaus.plexus:plexus-maven-plugin:${plexus-maven-plugin.version}:descriptor

Modified: trunk/maven-doxia-tools/debian/changelog
===================================================================
--- trunk/maven-doxia-tools/debian/changelog	2010-03-20 23:00:53 UTC (rev 11905)
+++ trunk/maven-doxia-tools/debian/changelog	2010-03-20 23:04:05 UTC (rev 11906)
@@ -1,3 +1,18 @@
+maven-doxia-tools (1.2-3) unstable; urgency=low
+
+  * Add myself as Uploaders
+  * Replace usage of outdated libplexus-component-metadata-java by
+    libplexus-maven-plugin-java (to generate Plexus component.xml):
+    - debian/control: Build-Depends on libplexus-maven-plugin-java,
+      velocity and libplexus-velocity-java
+    - debian/rules: Pass "1.3.8" to build.xml as plexus-maven-plugin.version
+    - debian/build.properties: Use plexus-maven-plugin:descriptor goal
+    This should fix issue "Component descriptor cannot be found in the
+    component repository: org.apache.maven.artifact.resolver.ArtifactResolver"
+    when using maven-site-plugin.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 20 Mar 2010 23:34:40 +0100
+
 maven-doxia-tools (1.2-2) unstable; urgency=low
 
   * Rebuild package with maven-repo-helper 1.0.4.

Modified: trunk/maven-doxia-tools/debian/control
===================================================================
--- trunk/maven-doxia-tools/debian/control	2010-03-20 23:00:53 UTC (rev 11905)
+++ trunk/maven-doxia-tools/debian/control	2010-03-20 23:04:05 UTC (rev 11906)
@@ -2,12 +2,11 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
 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-component-metadata-java (>= 1.0~beta3.0.7),
- libdoxia-sitetools-java, libcommons-io-java, 
- libplexus-container-default-java, libmaven2-core-java
+ junit, libmaven-plugin-tools-java, libplexus-maven-plugin-java, velocity, libplexus-velocity-java,
+ libdoxia-sitetools-java, libcommons-io-java, libplexus-container-default-java, libmaven2-core-java
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-doxia-tools
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-doxia-tools/

Modified: trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff	2010-03-20 23:00:53 UTC (rev 11905)
+++ trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff	2010-03-20 23:04:05 UTC (rev 11906)
@@ -1,5 +1,5 @@
---- maven-doxia-tools.orig/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2008-06-07 12:18:58.000000000 +0200
-+++ maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2008-12-17 15:54:28.000000000 +0100
+--- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
++++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
 @@ -45,10 +45,11 @@
  import org.codehaus.plexus.util.IOUtil;
  import org.codehaus.plexus.util.ReaderFactory;

Modified: trunk/maven-doxia-tools/debian/patches/setLastModified.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/setLastModified.diff	2010-03-20 23:00:53 UTC (rev 11905)
+++ trunk/maven-doxia-tools/debian/patches/setLastModified.diff	2010-03-20 23:04:05 UTC (rev 11906)
@@ -1,5 +1,5 @@
---- maven-doxia-tools~/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2010-02-07 22:24:33.000000000 +0100
-+++ maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2010-02-25 22:47:12.000000000 +0100
+--- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
++++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
 @@ -1245,7 +1245,6 @@
                                                                            inputEncoding, outputEncoding );
  

Modified: trunk/maven-doxia-tools/debian/rules
===================================================================
--- trunk/maven-doxia-tools/debian/rules	2010-03-20 23:00:53 UTC (rev 11905)
+++ trunk/maven-doxia-tools/debian/rules	2010-03-20 23:04:05 UTC (rev 11906)
@@ -5,16 +5,14 @@
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-# Need to specify the exact version of the Plexus plugin (from plexus-component-metadata package) used here
-PLEXUS_PLUGIN_VERSION:= 1.0-beta-3.0.7
+PLEXUS_PLUGIN_VERSION:= 1.3.8
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps doxia-core doxia-logging-api doxia-sink-api doxia-decoration-model.jar doxia-doc-renderer \
  doxia-site-renderer commons-io plexus-i18n plexus-container-default-alpha plexus-utils plexus-interpolation \
  maven-core maven-project maven-artifact maven-artifact-manager maven-model maven-reporting-api maven-plugin-api
 DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dplexus-component-metadata.version=$(PLEXUS_PLUGIN_VERSION)
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dplexus-maven-plugin.version=$(PLEXUS_PLUGIN_VERSION)
 API_DOCS             := target/api
 
 binary-post-install/lib$(PACKAGE)-java::


