[pkg-java] r9349 - in trunk/maven-site-plugin/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Wed Jul 15 00:20:24 UTC 2009
Author: ludovicc-guest
Date: 2009-07-15 00:20:22 +0000 (Wed, 15 Jul 2009)
New Revision: 9349
Added:
trunk/maven-site-plugin/debian/build.properties
trunk/maven-site-plugin/debian/libmaven-site-plugin-java.poms
trunk/maven-site-plugin/debian/maven-settings.xml
trunk/maven-site-plugin/debian/maven.rules
trunk/maven-site-plugin/debian/patches/doxia1.1.patch
Removed:
trunk/maven-site-plugin/debian/maven.properties
trunk/maven-site-plugin/debian/patches/pom.diff
Modified:
trunk/maven-site-plugin/debian/changelog
trunk/maven-site-plugin/debian/compat
trunk/maven-site-plugin/debian/control
trunk/maven-site-plugin/debian/copyright
trunk/maven-site-plugin/debian/orig-tar.sh
trunk/maven-site-plugin/debian/patches/series
trunk/maven-site-plugin/debian/rules
Log:
* New upstream version, add myself to Uploaders
* Bump up debhelper to 6
* Migrate the build from cdbs-maven to cdbs-ant as Maven uses
this plugin for its build, reorganize Build-Depends to use
only what's needed now.
* 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
* Remove Depends on Java runtimes as it is a library
* Change the dependency from libtomcat6-java to libjetty-java
(going back to the original code in maven-site-plugin),
made this dependency optional (Suggests:) as it's not needed
most of the time.
* Add a patch to support Doxia 1.1
Added: trunk/maven-site-plugin/debian/build.properties
===================================================================
--- trunk/maven-site-plugin/debian/build.properties (rev 0)
+++ trunk/maven-site-plugin/debian/build.properties 2009-07-15 00:20:22 UTC (rev 9349)
@@ -0,0 +1,4 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
+maven.generate.target=plugin:descriptor
Modified: trunk/maven-site-plugin/debian/changelog
===================================================================
--- trunk/maven-site-plugin/debian/changelog 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/changelog 2009-07-15 00:20:22 UTC (rev 9349)
@@ -1,3 +1,23 @@
+maven-site-plugin (2.0-1) experimental; urgency=low
+
+ * New upstream version, add myself to Uploaders
+ * Bump up debhelper to 6
+ * Migrate the build from cdbs-maven to cdbs-ant as Maven uses
+ this plugin for its build, reorganize Build-Depends to use
+ only what's needed now.
+ * 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
+ * Remove Depends on Java runtimes as it is a library
+ * Change the dependency from libtomcat6-java to libjetty-java
+ (going back to the original code in maven-site-plugin),
+ made this dependency optional (Suggests:) as it's not needed
+ most of the time.
+ * Add a patch to support Doxia 1.1
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 14 Jul 2009 15:26:39 +0100
+
maven-site-plugin (2.0~beta7-2) unstable; urgency=low
* Switch to libtomcat6-java. (Closes: #533147)
Modified: trunk/maven-site-plugin/debian/compat
===================================================================
--- trunk/maven-site-plugin/debian/compat 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/compat 2009-07-15 00:20:22 UTC (rev 9349)
@@ -1 +1 @@
-5
+6
Modified: trunk/maven-site-plugin/debian/control
===================================================================
--- trunk/maven-site-plugin/debian/control 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/control 2009-07-15 00:20:22 UTC (rev 9349)
@@ -2,9 +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>
-Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven-debian-helper,
- libsurefire-java, libmaven-doxia-tools-java, libtomcat6-java
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 6), cdbs, openjdk-6-jdk, quilt, maven-ant-helper (>> 4), ant-optional
+Build-Depends-Indep: maven-repo-helper,
+ junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
+ libmaven-doxia-tools-java, libjetty-java
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-site-plugin
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-site-plugin/
@@ -12,8 +14,8 @@
Package: libmaven-site-plugin-java
Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime, libmaven-doxia-tools-java,
- libtomcat6-java
+Depends: ${misc:Depends}, libmaven-doxia-tools-java
+Suggests: libjetty-java
Description: Maven Site Plugin for generating a site
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
Modified: trunk/maven-site-plugin/debian/copyright
===================================================================
--- trunk/maven-site-plugin/debian/copyright 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/copyright 2009-07-15 00:20:22 UTC (rev 9349)
@@ -1,34 +1,22 @@
-This package was debianized by Torsten Werner <twerner at debian.org>.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Maven Site Plugin
+Maintainer: Apache Maven team
+Source: http://maven.apache.org/
-The Debian packaging is Copyright (c) 2008 Torsten Werner and is
-licensed under the GNU General Public License version 3. On Debian
-systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL-3'.
+Files: *
+Copyright: 2001-2009, The Apache Software Foundation.
+License: Apache-2.0
-The package was downloaded from
-<http://maven.apache.org/plugins/maven-site-plugin/>.
+Files: debian/*
+Copyright: 2008, Torsten Werner <twerner at debian.org>.
+License: GPL-3
-Copyright:
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
- 2002-2008 Apache Contributors
+License: GPL-3
+ On Debian GNU/Linux system you can find the complete text of the
+ GNU General Public License version 3 license in
+ '/usr/share/common-licenses/GPL-3'.
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.
-
-License:
-
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-The full text of the license can be found in
-`/usr/share/common-licenes/Apache-2.0'.
Added: trunk/maven-site-plugin/debian/libmaven-site-plugin-java.poms
===================================================================
--- trunk/maven-site-plugin/debian/libmaven-site-plugin-java.poms (rev 0)
+++ trunk/maven-site-plugin/debian/libmaven-site-plugin-java.poms 2009-07-15 00:20:22 UTC (rev 9349)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/maven-site-plugin/debian/maven-settings.xml
===================================================================
--- trunk/maven-site-plugin/debian/maven-settings.xml (rev 0)
+++ trunk/maven-site-plugin/debian/maven-settings.xml 2009-07-15 00:20:22 UTC (rev 9349)
@@ -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>
Deleted: trunk/maven-site-plugin/debian/maven.properties
===================================================================
--- trunk/maven-site-plugin/debian/maven.properties 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/maven.properties 2009-07-15 00:20:22 UTC (rev 9349)
@@ -1 +0,0 @@
-maven.test.skip = true
Added: trunk/maven-site-plugin/debian/maven.rules
===================================================================
--- trunk/maven-site-plugin/debian/maven.rules (rev 0)
+++ trunk/maven-site-plugin/debian/maven.rules 2009-07-15 00:20:22 UTC (rev 9349)
@@ -0,0 +1,4 @@
+# keep the version for all Maven plugins as versionless plugins don't work
+* * maven-plugin *
+junit junit jar s/3\..*/3.x/
+org.mortbay.jetty * * s/6\..*/6.x/
Property changes on: trunk/maven-site-plugin/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Added: trunk/maven-site-plugin/debian/patches/doxia1.1.patch
===================================================================
--- trunk/maven-site-plugin/debian/patches/doxia1.1.patch (rev 0)
+++ trunk/maven-site-plugin/debian/patches/doxia1.1.patch 2009-07-15 00:20:22 UTC (rev 9349)
@@ -0,0 +1,33 @@
+--- a/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
++++ b/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
+@@ -21,7 +21,7 @@
+
+ import org.apache.maven.artifact.factory.ArtifactFactory;
+ import org.apache.maven.artifact.resolver.ArtifactResolver;
+-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
++import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.site.decoration.DecorationModel;
+ import org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
+ import org.apache.maven.doxia.siterenderer.DocumentRenderer;
+--- a/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
++++ b/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
+@@ -19,7 +19,7 @@
+ * under the License.
+ */
+
+-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
++import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.siterenderer.DocumentRenderer;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
+--- a/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
++++ b/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
+@@ -19,7 +19,7 @@
+ * under the License.
+ */
+
+-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
++import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.sink.Sink;
+ import org.apache.maven.doxia.sink.SinkFactory;
+ import org.apache.maven.doxia.siterenderer.DocumentRenderer;
Deleted: trunk/maven-site-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-site-plugin/debian/patches/pom.diff 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/patches/pom.diff 2009-07-15 00:20:22 UTC (rev 9349)
@@ -1,187 +0,0 @@
-Index: maven-site-plugin-2.0~beta7/pom.xml
-===================================================================
---- maven-site-plugin-2.0~beta7.orig/pom.xml 2008-06-26 20:38:32.000000000 +0200
-+++ maven-site-plugin-2.0~beta7/pom.xml 2008-12-16 17:40:20.000000000 +0100
-@@ -19,13 +19,16 @@
- -->
-
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-+ <!--
- <parent>
- <artifactId>maven-plugins</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>11</version>
- </parent>
-+ -->
-
- <modelVersion>4.0.0</modelVersion>
-+ <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Maven Site Plugin</name>
-@@ -154,14 +157,24 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
-- <version>2.4.2</version>
-+ <version>${org.apache.maven.plugins.maven-plugin-plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
-- <version>2.3</version>
-+ <version>${org.apache.maven.plugins.maven-surefire-plugin.version}</version>
-+ </plugin>
-+ <!-- some source files don't build yet -->
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-compiler-plugin</artifactId>
-+ <configuration>
-+ <excludes>
-+ <exclude>**/SiteRunMojo.java</exclude>
-+ </excludes>
-+ </configuration>
- </plugin>
- </plugins>
- </build>
-@@ -214,6 +227,14 @@
- <!-- Maven -->
- <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-artifact</artifactId>
- <version>2.0.2</version>
- </dependency>
-@@ -247,17 +268,29 @@
- <artifactId>maven-reporting-api</artifactId>
- <version>2.0.4</version>
- </dependency>
-+ -->
-
- <!-- Doxia -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
-+ <artifactId>doxia-core</artifactId>
-+ <version>${doxiaVersion}</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/doxia-core.jar</systemPath>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- <version>${doxiaVersion}</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/doxia-module-xhtml.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- <version>${doxiaVersion}</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/doxia-sink-api.jar</systemPath>
- </dependency>
-
- <!-- Doxia-sitetools -->
-@@ -265,6 +298,8 @@
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
- <version>${doxiaSitetoolsVersion}</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/doxia-decoration-model.jar</systemPath>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
-@@ -280,6 +315,8 @@
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- <version>${doxiaSitetoolsVersion}</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/doxia-site-renderer.jar</systemPath>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
-@@ -303,23 +340,22 @@
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>${wagonVersion}</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/wagon-provider-api.jar</systemPath>
- </dependency>
-
- <!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
-- <version>1.0-alpha-7</version>
-- </dependency>
-- <dependency>
-- <groupId>org.codehaus.plexus</groupId>
-- <artifactId>plexus-container-default</artifactId>
-- <version>1.0-alpha-9</version>
-+ <version>${org.codehaus.plexus.plexus-archiver.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-i18n</artifactId>
- <version>1.0-beta-7</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/plexus-i18n.jar</systemPath>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
-@@ -329,6 +365,14 @@
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
-+ <artifactId>plexus-classworlds</artifactId>
-+ <version>1.2</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/plexus-classworlds.jar</systemPath>
-+ </dependency>
-+ <!--
-+ <dependency>
-+ <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
- </dependency>
-@@ -338,14 +382,31 @@
- <artifactId>jetty</artifactId>
- <version>6.1.5</version>
- </dependency>
-+ -->
-+ <dependency>
-+ <groupId>commons-lang</groupId>
-+ <artifactId>commons-lang</artifactId>
-+ <version>2.4</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/commons-lang.jar</systemPath>
-+ </dependency>
-+ <dependency>
-+ <groupId>tomcat</groupId>
-+ <artifactId>servlet-api</artifactId>
-+ <version>2.4</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/servlet-api.jar</systemPath>
-+ </dependency>
-
- <!-- test -->
-+ <!--
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
- <scope>test</scope>
- </dependency>
-+ -->
- </dependencies>
-
- <reporting>
Modified: trunk/maven-site-plugin/debian/patches/series
===================================================================
--- trunk/maven-site-plugin/debian/patches/series 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/patches/series 2009-07-15 00:20:22 UTC (rev 9349)
@@ -1 +1 @@
-pom.diff
+doxia1.1.patch
Modified: trunk/maven-site-plugin/debian/rules
===================================================================
--- trunk/maven-site-plugin/debian/rules 2009-07-15 00:12:38 UTC (rev 9348)
+++ trunk/maven-site-plugin/debian/rules 2009-07-15 00:20:22 UTC (rev 9349)
@@ -1,10 +1,28 @@
#!/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/java-6-openjdk
+DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api maven-project maven-artifact maven-artifact-manager \
+ maven-settings maven-reporting-api maven-doxia-tools doxia-core doxia-logging-api doxia-sink-api doxia-module-xhtml \
+ doxia-decoration-model doxia-site-renderer wagon-provider-api plexus-archiver plexus-container-default-alpha \
+ plexus-i18n plexus-utils jetty jetty-util jetty-util5 commons-lang servlet-api-2.5 \
+ classworlds
+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
Property changes on: trunk/maven-site-plugin/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
More information about the pkg-java-commits
mailing list