Fri Jul 28 13:29:09 UTC 2017

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-doxia-tools.

commit 56957d2fb6f4f0d5cc22dbf4de3bf6a8393118e4
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Mar 20 23:04:05 2010 +0000

    * 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.
---
 debian/build.properties                  |  2 +-
 debian/changelog                         | 15 +++++++++++++++
 debian/control                           |  7 +++----
 debian/patches/plexus-interpolation.diff |  4 ++--
 debian/patches/setLastModified.diff      |  4 ++--
 debian/rules                             |  6 ++----
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 43828cd..630f6ea 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -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
diff --git a/debian/changelog b/debian/changelog
index 618cd86..c8226cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index 36761e5..8fd96b3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,11 @@ Source: maven-doxia-tools
 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/
diff --git a/debian/patches/plexus-interpolation.diff b/debian/patches/plexus-interpolation.diff
index 2ae66f0..66c6009 100644
--- a/debian/patches/plexus-interpolation.diff
+++ b/debian/patches/plexus-interpolation.diff
@@ -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;
diff --git a/debian/patches/setLastModified.diff b/debian/patches/setLastModified.diff
index 8be38b2..0b877b8 100644
--- a/debian/patches/setLastModified.diff
+++ b/debian/patches/setLastModified.diff
@@ -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 );
  
diff --git a/debian/rules b/debian/rules
index 224d60d..a1bdbfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,16 +5,14 @@ include /usr/share/cdbs/1/class/ant.mk
 
 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::

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-doxia-tools.git

