[pkg-java] r8415 - in trunk/trunk/maven2-core: . debian debian/patches

Ludovic Claude ludovicc-guest at alioth.debian.org
Thu Jun 11 13:33:07 UTC 2009


Author: ludovicc-guest
Date: 2009-06-11 13:33:04 +0000 (Thu, 11 Jun 2009)
New Revision: 8415

Added:
   trunk/trunk/maven2-core/debian/
   trunk/trunk/maven2-core/debian/README.Debian-source
   trunk/trunk/maven2-core/debian/build.properties
   trunk/trunk/maven2-core/debian/build.xml
   trunk/trunk/maven2-core/debian/changelog
   trunk/trunk/maven2-core/debian/compat
   trunk/trunk/maven2-core/debian/control
   trunk/trunk/maven2-core/debian/copyright
   trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.doc-base
   trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.docs
   trunk/trunk/maven2-core/debian/libmaven2-core-java.poms
   trunk/trunk/maven2-core/debian/maven.rules
   trunk/trunk/maven2-core/debian/orig-tar.sh
   trunk/trunk/maven2-core/debian/patches/
   trunk/trunk/maven2-core/debian/patches/plugin-versions.patch
   trunk/trunk/maven2-core/debian/patches/remove_webdav_support.patch
   trunk/trunk/maven2-core/debian/patches/series
   trunk/trunk/maven2-core/debian/rules
   trunk/trunk/maven2-core/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: trunk/trunk/maven2-core/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: trunk/trunk/maven2-core/debian/README.Debian-source
===================================================================
--- trunk/trunk/maven2-core/debian/README.Debian-source	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/README.Debian-source	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,9 @@
+maven2-core package
+---------------------
+
+This package has been separated from maven2 as it contains only the libraries for
+Maven2, and those libraries are used to build some Maven plugins which are used 
+to build Maven2 itself.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 03 May 2009 12:04:20 +0000
+

Added: trunk/trunk/maven2-core/debian/build.properties
===================================================================
--- trunk/trunk/maven2-core/debian/build.properties	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/build.properties	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,39 @@
+javadoc.dir=build/docs/api
+classpath.compile = \
+            ${basedir}/maven-artifact/build/maven-artifact-${version}.jar:\
+            ${basedir}/maven-repository-metadata/build/maven-repository-metadata-${version}.jar:\
+            ${basedir}/maven-artifact-manager/build/maven-artifact-manager-${version}.jar:\
+            ${basedir}/maven-model/build/maven-model-${version}.jar:\
+            ${basedir}/maven-settings/build/maven-settings-${version}.jar:\
+            ${basedir}/maven-artifact-test/build/maven-artifact-test-${version}.jar:\
+            ${basedir}/maven-plugin-parameter-documenter/build/maven-plugin-parameter-documenter-${version}.jar:\
+            ${basedir}/maven-reporting/build/maven-reporting-${version}.jar:\
+            ${basedir}/maven-reporting/maven-reporting-api/build/maven-reporting-api-${version}.jar:\
+            ${basedir}/maven-profile/build/maven-profile-${version}.jar:\
+            ${basedir}/maven-error-diagnostics/build/maven-error-diagnostics-${version}.jar:\
+            ${basedir}/maven-plugin-registry/build/maven-plugin-registry-${version}.jar:\
+            ${basedir}/maven-project/build/maven-project-${version}.jar:\
+            ${basedir}/maven-plugin-api/build/maven-plugin-api-${version}.jar:\
+            ${basedir}/maven-plugin-descriptor/build/maven-plugin-descriptor-${version}.jar:\
+            ${basedir}/maven-monitor/build/maven-monitor-${version}.jar:\
+            ${basedir}/maven-core/build/maven-core-${version}.jar:\
+            ${basedir}/maven-script/build/maven-script-${version}.jar:\
+		    /usr/share/java/backport-util-concurrent.jar:\
+		    /usr/share/java/doxia-sink-api.jar:\
+		    /usr/share/java/bsh.jar:\
+		    /usr/share/java/classworlds.jar:\
+            /usr/share/java/commons-cli.jar:\
+            /usr/share/java/junit.jar:\
+            /usr/share/java/modello-core.jar:\
+            /usr/share/java/plexus-ant-factory.jar:\
+            /usr/share/java/plexus-bsh-factory.jar:\
+            /usr/share/java/plexus-archiver.jar:\
+            /usr/share/java/plexus-classworlds.jar:\
+            /usr/share/java/plexus-cipher.jar:\
+            /usr/share/java/plexus-container-default-alpha.jar:\
+            /usr/share/java/plexus-interactivity-api.jar:\
+            /usr/share/java/plexus-interpolation.jar:\
+            /usr/share/java/plexus-sec-dispatcher.jar:\
+            /usr/share/java/plexus-utils.jar:\
+            /usr/share/java/wagon-provider-api.jar
+

Added: trunk/trunk/maven2-core/debian/build.xml
===================================================================
--- trunk/trunk/maven2-core/debian/build.xml	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/build.xml	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+
+<project name="pkg-java" default="package" basedir="..">
+
+    <property file="debian/build.properties"/>
+    <property name="maven.test.skip" value="true"/>
+    <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+    <macrodef name="cleanmodule">
+        <attribute name="dir"/>
+        <sequential>
+          <ant target="clean"
+            antfile="${maven.build.xml}" dir="@{dir}">
+          </ant>
+        </sequential>
+    </macrodef>
+
+    <target name="clean">
+        <cleanmodule dir="."/>
+        <cleanmodule dir="maven-artifact"/>
+        <cleanmodule dir="maven-repository-metadata"/>
+        <cleanmodule dir="maven-artifact-manager"/>
+        <cleanmodule dir="maven-model"/>
+        <cleanmodule dir="maven-settings"/>
+        <cleanmodule dir="maven-artifact-test"/>
+        <cleanmodule dir="maven-plugin-parameter-documenter"/>
+        <cleanmodule dir="maven-reporting"/>
+        <cleanmodule dir="maven-reporting/maven-reporting-api"/>
+        <cleanmodule dir="maven-profile"/>
+        <cleanmodule dir="maven-error-diagnostics"/>
+        <cleanmodule dir="maven-plugin-registry"/>
+        <cleanmodule dir="maven-project"/>
+        <cleanmodule dir="maven-plugin-api"/>
+        <cleanmodule dir="maven-plugin-descriptor"/>
+        <cleanmodule dir="maven-monitor"/>
+        <cleanmodule dir="maven-core"/>
+        <cleanmodule dir="maven-script"/>
+        <cleanmodule dir="maven-script/maven-script-ant"/>
+        <cleanmodule dir="maven-script/maven-script-beanshell"/>
+        <cleanmodule dir="maven-toolchain"/>
+    </target>
+
+    <target name="generate-sources">
+        <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar:/usr/share/java/modello-core.jar:/usr/share/java/modello-plugin-xml.jar:/usr/share/java/modello-plugin-xpp3.jar"/>
+        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="java" output="maven-settings/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="java" output="maven-profile/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="java" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="java" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="java" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="java" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-model/src/main/mdo/maven.mdo" plugin="java" output="maven-model/build/generated-sources" version="4.0.0"/>
+        <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="java" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+
+        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-reader" output="maven-settings/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-reader" output="maven-profile/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-reader" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-reader" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-reader" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-reader" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-reader" output="maven-model/build/generated-sources" version="4.0.0"/>
+        <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+
+        <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-writer" output="maven-settings/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-writer" output="maven-profile/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-writer" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-writer" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-writer" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-writer" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
+        <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-writer" output="maven-model/build/generated-sources" version="4.0.0"/>
+        <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-writer" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+
+        <mkdir dir="maven-core/${build.outputDirectory}/org/apache/maven/messages/" />
+        <copy todir="maven-core/${build.outputDirectory}/org/apache/maven/messages/" 
+              file="maven-core/src/main/resources/org/apache/maven/messages/build.properties">
+          <filterset begintoken="$${" endtoken="}">
+             <filter token="project.version" value="${version}"/>
+             <filter token="buildNumber" value="debian-${buildVersion}"/>
+          </filterset>
+        </copy>
+    </target>
+
+    <macrodef name="packagemodule">
+        <attribute name="dir"/>
+        <attribute name="artifactId" default="@{dir}"/>
+        <sequential>
+          <java classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar"
+             classname="org.debian.maven.repo.POMCleaner" >
+            <arg value="-pmaven2-core" />
+            <arg value="-rdebian/maven.rules" />
+            <arg value="@{dir}/pom.xml" />
+            <arg value="@{dir}/${build.outputDirectory}/META-INF/maven/org.apache.maven/@{artifactId}/pom.xml" />
+            <arg value="@{dir}/${build.outputDirectory}/META-INF/maven/org.apache.maven/@{artifactId}/pom.properties" />
+          </java> 
+          <ant target="package"
+            antfile="${maven.build.xml}" dir="@{dir}">
+            <property name="artifactId" value="@{artifactId}"/>
+          </ant>
+        </sequential>
+    </macrodef>
+
+    <target name="package" depends="generate-sources">
+        <packagemodule dir="maven-artifact"/>
+        <packagemodule dir="maven-repository-metadata"/>
+        <packagemodule dir="maven-artifact-manager"/>
+        <packagemodule dir="maven-model"/>
+        <packagemodule dir="maven-settings"/>
+        <packagemodule dir="maven-artifact-test"/>
+        <packagemodule dir="maven-plugin-parameter-documenter"/>
+        <packagemodule dir="maven-reporting/maven-reporting-api" artifactId="maven-reporting-api"/>
+        <packagemodule dir="maven-profile"/>
+        <packagemodule dir="maven-error-diagnostics"/>
+        <packagemodule dir="maven-plugin-registry"/>
+        <packagemodule dir="maven-project"/>
+        <packagemodule dir="maven-plugin-api"/>
+        <packagemodule dir="maven-plugin-descriptor"/>
+        <packagemodule dir="maven-monitor"/>
+        <packagemodule dir="maven-core"/>
+        <packagemodule dir="maven-script/maven-script-ant" artifactId="maven-script-ant"/>
+        <packagemodule dir="maven-script/maven-script-beanshell" artifactId="maven-script-beanshell"/>
+        <packagemodule dir="maven-toolchain"/>
+    </target>
+
+    <target name="javadoc">
+        <javadoc destdir="${javadoc.dir}">
+            <packageset dir="maven-artifact/src/main/java/"/>
+            <packageset dir="maven-repository-metadata/src/main/java/"/>
+            <packageset dir="maven-artifact-manager/src/main/java/"/>
+            <packageset dir="maven-model/src/main/java/"/>
+            <packageset dir="maven-settings/src/main/java/"/>
+            <packageset dir="maven-artifact-test/src/main/java/"/>
+            <packageset dir="maven-plugin-parameter-documenter/src/main/java/"/>
+            <packageset dir="maven-reporting/maven-reporting-api/src/main/java/"/>
+            <packageset dir="maven-profile/src/main/java/"/>
+            <packageset dir="maven-error-diagnostics/src/main/java/"/>
+            <packageset dir="maven-plugin-registry/src/main/java/"/>
+            <packageset dir="maven-project/src/main/java/"/>
+            <packageset dir="maven-plugin-api/src/main/java/"/>
+            <packageset dir="maven-plugin-descriptor/src/main/java/"/>
+            <packageset dir="maven-monitor/src/main/java/"/>
+            <packageset dir="maven-core/src/main/java/"/>
+            <packageset dir="maven-script/maven-script-ant/src/main/java/"/>
+            <packageset dir="maven-script/maven-script-beanshell/src/main/java/"/>
+            <packageset dir="maven-toolchain/src/main/java/"/>
+        </javadoc>
+    </target>
+
+</project>

Added: trunk/trunk/maven2-core/debian/changelog
===================================================================
--- trunk/trunk/maven2-core/debian/changelog	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/changelog	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,7 @@
+maven2-core (2.1.0-0ubuntu1~ppa9) jaunty; urgency=low
+
+  * Initial release, contains the Maven libraries from
+    the maven2 package which is now split in two for build reasons.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 03 May 2009 12:04:20 +0000
+

Added: trunk/trunk/maven2-core/debian/compat
===================================================================
--- trunk/trunk/maven2-core/debian/compat	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/compat	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1 @@
+6

Added: trunk/trunk/maven2-core/debian/control
===================================================================
--- trunk/trunk/maven2-core/debian/control	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/control	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,66 @@
+Source: maven2-core
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), quilt, default-jdk
+Build-Depends-Indep: ant, ant-optional,
+  junit, maven-ant-helper, maven-repo-helper,
+  libcommons-cli-java (>= 1.1),
+  libdoxia-java, libmodello-java, libplexus-container-default-java,
+  libplexus-ant-factory-java, libplexus-bsh-factory-java,
+  libplexus-archiver-java, libplexus-sec-dispatcher-java,
+  libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java, 
+  libplexus-utils-java (>=1:1.5.5), libwagon-java, libbackport-util-concurrent-java
+Standards-Version: 3.8.1
+Homepage: http://maven.apache.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2-core
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2-core
+
+Package: libmaven2-core-java
+Architecture: all
+Depends: ${misc:Depends}, libcommons-cli-java (>= 1.1), 
+  libdoxia-java, libmodello-java, libplexus-container-default-java,
+  libplexus-archiver-java, libplexus-sec-dispatcher-java,
+  libplexus-ant-factory-java, libplexus-bsh-factory-java,
+  libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java, 
+  libplexus-utils-java (>=1:1.5.5), libwagon-java, libbackport-util-concurrent-java
+Description: Core libraries for Maven2
+ 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,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+    * Making the build process easy
+    * Providing a uniform build system
+    * Providing quality project information
+    * Providing guidelines for best practices development
+    * Allowing transparent migration to new features
+ .
+ This package contains the core libraries for maven2.
+
+Package: libmaven2-core-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: API documentation for Maven2
+ 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,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+    * Making the build process easy
+    * Providing a uniform build system
+    * Providing quality project information
+    * Providing guidelines for best practices development
+    * Allowing transparent migration to new features
+ .
+ This package contains the API documentation of Maven2.

Added: trunk/trunk/maven2-core/debian/copyright
===================================================================
--- trunk/trunk/maven2-core/debian/copyright	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/copyright	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,62 @@
+This package was debianized by Paul Cager <paul-debian at home.paulcager.org>
+on Sun, 29 Apr 2007 18:27:29 +0100
+
+The Debian packaging is Copyright (c) 2007 Paul Cager and is licensed under
+the GNU General Public License version 2. On Debian systems, the complete text
+of the GNU General Public License version 2 can be found in
+'/usr/share/common-licenses/GPL-2'.
+
+It was downloaded from:
+    http://maven.apache.org
+
+Upstream authors:
+    Antoine Levy-Lambert <levylambert at tiscali-dsl.de>
+    Arnout J. Kuiper
+    Brett Porter <brett at apache.org>
+    Bruce Atherton <bruce at callenish.com>
+    Carlos Sanchez <carlos at apache.org>
+    Christoph.Reck <Christoph.Reck at dlr.de>
+    costin at dnt.ro
+    Daniel Rall <dlr at finemaltcoding.com>
+    Emmanuel Venisse <evenisse at apache.org>
+    gg at grtmail.com
+    Jason van Zyl <jason at maven.org> <jason at plexus.org> <jason at zenplex.com>
+    jdcasey
+    Jeff Turner <jefft at codehaus.org>
+    John Casey
+    Kenney Westerhof <kenney at apache.org>
+    Kevin A. Burton <burton at relativity.yi.org>
+    Magesh Umasankar
+    Michal Maczka <michal at codehaus.org> <michal.maczka at dimatics.com> <mmaczka at interia.pl>
+    Patrick Schneider <pschneider at gmail.com>
+    Peter Donald <peter at codehaus.org>
+    Ralph Goers <rgoers at apache.org>
+    Scott Sanders <sanders at codehaus.org>
+    Stefano Mazzocchi <stefano at apache.org>
+    Trygve Laugstol <trygvis at inamo.no>
+    Vincent Siveton <vincent.siveton at gmail.com>
+
+Copyright:
+    Copyright (c) 2001-2007 Apache Software Foundation.
+
+License:
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  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.
+
+On Debian systems, the complete text of the Apache License
+version 2.0 can be found in /usr/share/common-licenses/Apache-2.0

Added: trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.doc-base
===================================================================
--- trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.doc-base	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.doc-base	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,10 @@
+Document: libmaven2-core-java-doc
+Title: Programmer API for Maven 2
+Author: Apache Maven2 developers
+Abstract: Programmer API of Maven2,
+ a software project management and comprehension tool.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmaven2-core-java-doc/api/index.html
+Files: /usr/share/doc/libmaven2-core-java-doc/api/*

Added: trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.docs
===================================================================
--- trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.docs	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/libmaven2-core-java-doc.docs	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1 @@
+build/docs/api

Added: trunk/trunk/maven2-core/debian/libmaven2-core-java.poms
===================================================================
--- trunk/trunk/maven2-core/debian/libmaven2-core-java.poms	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/libmaven2-core-java.poms	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,23 @@
+pom.xml --no-parent
+maven-artifact-manager/pom.xml
+maven-artifact-test/pom.xml
+maven-artifact/pom.xml
+maven-core/pom.xml
+maven-error-diagnostics/pom.xml
+maven-model/pom.xml
+maven-monitor/pom.xml
+maven-plugin-api/pom.xml
+maven-plugin-descriptor/pom.xml
+maven-plugin-parameter-documenter/pom.xml
+maven-plugin-registry/pom.xml
+maven-profile/pom.xml
+maven-project/pom.xml
+maven-reporting/maven-reporting-api/pom.xml
+maven-reporting/pom.xml
+maven-repository-metadata/pom.xml
+maven-script/pom.xml
+maven-script/maven-script-ant/pom.xml
+maven-script/maven-script-beanshell/pom.xml
+maven-settings/pom.xml
+maven-toolchain/pom.xml
+

Added: trunk/trunk/maven2-core/debian/maven.rules
===================================================================
--- trunk/trunk/maven2-core/debian/maven.rules	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/maven.rules	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,2 @@
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/
+s/bsh/org.beanshell/ bsh jar s/.*/debian/

Added: trunk/trunk/maven2-core/debian/orig-tar.sh
===================================================================
--- trunk/trunk/maven2-core/debian/orig-tar.sh	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/orig-tar.sh	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../maven2-core_$VERSION.orig.tar.gz
+DIR=maven2-core-$VERSION
+TAG=$(echo maven-$2 | sed s/~RC/-RC/ )
+
+svn export http://svn.apache.org/repos/asf/maven/components/tags/$TAG $DIR
+# remove the jar as Debian requires everything to be built from source, it will be rebuild from source
+rm $DIR/maven-ant-tasks*.jar
+tar -c -z -f $TAR $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"
+fi

Added: trunk/trunk/maven2-core/debian/patches/plugin-versions.patch
===================================================================
--- trunk/trunk/maven2-core/debian/patches/plugin-versions.patch	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/patches/plugin-versions.patch	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,38 @@
+--- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
++++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+@@ -80,7 +80,7 @@
+          </plugin>         
+          <plugin>
+            <artifactId>maven-clean-plugin</artifactId>
+-           <version>2.2</version>
++           <version>2.3</version>
+          </plugin>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+@@ -104,7 +104,7 @@
+          </plugin>
+          <plugin>
+            <artifactId>maven-install-plugin</artifactId>
+-           <version>2.2</version>
++           <version>2.3</version>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+@@ -116,7 +116,7 @@
+          </plugin>
+          <plugin>
+            <artifactId>maven-plugin-plugin</artifactId>
+-           <version>2.4.3</version>
++           <version>2.5</version>
+          </plugin>
+          <plugin>
+            <artifactId>maven-rar-plugin</artifactId>
+@@ -132,7 +132,7 @@
+          </plugin>
+          <plugin>
+            <artifactId>maven-site-plugin</artifactId>
+-           <version>2.0-beta-7</version>
++           <version>2.0</version>
+          </plugin>
+          <plugin>
+            <artifactId>maven-source-plugin</artifactId>

Added: trunk/trunk/maven2-core/debian/patches/remove_webdav_support.patch
===================================================================
--- trunk/trunk/maven2-core/debian/patches/remove_webdav_support.patch	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/patches/remove_webdav_support.patch	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,28 @@
+--- a/maven-core/pom.xml
++++ b/maven-core/pom.xml
+@@ -45,11 +45,6 @@
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven.wagon</groupId>
+-      <artifactId>wagon-webdav-jackrabbit</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.maven.wagon</groupId>
+       <artifactId>wagon-http-lightweight</artifactId>
+       <scope>runtime</scope>
+     </dependency>
+--- a/pom.xml
++++ b/pom.xml
+@@ -439,11 +439,6 @@
+       </dependency>
+       <dependency>
+         <groupId>org.apache.maven.wagon</groupId>
+-        <artifactId>wagon-webdav-jackrabbit</artifactId>
+-        <version>${wagonVersion}</version>
+-      </dependency>
+-      <dependency>
+-        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-http-lightweight</artifactId>
+         <version>${wagonVersion}</version>
+       </dependency>

Added: trunk/trunk/maven2-core/debian/patches/series
===================================================================
--- trunk/trunk/maven2-core/debian/patches/series	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/patches/series	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,2 @@
+remove_webdav_support.patch
+plugin-versions.patch

Added: trunk/trunk/maven2-core/debian/rules
===================================================================
--- trunk/trunk/maven2-core/debian/rules	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/rules	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,45 @@
+#!/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/rules/patchsys-quilt.mk
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+BUILD_VERSION        := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/[^-]*-//')
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE    := debian/build.xml
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -DbuildVersion=$(BUILD_VERSION)
+API_DOCS             := build/doc/api
+BASE_MODULES         := maven-artifact-manager maven-artifact-test maven-artifact \
+			maven-core maven-error-diagnostics maven-model maven-monitor \
+			maven-plugin-api maven-plugin-descriptor maven-plugin-parameter-documenter \
+			maven-plugin-registry maven-profile maven-project maven-repository-metadata \
+			maven-settings maven-toolchain
+
+get-orig-source:
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+makebuilddir/lib$(PACKAGE)-java::
+	# add empty directories to fix the build
+	install -d maven-repository-metadata/src/main/java
+	install -d maven-model/src/main/java
+	install -d maven-plugin-parameter-documenter/src/main/java
+
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java;
+	set -e; for MODULE in $(BASE_MODULES); do \
+	  mh_installjar -plib$(PACKAGE)-java -l $$MODULE/pom.xml $$MODULE/build/$$MODULE-$(VERSION).jar; \
+	done
+	mh_installjar -plib$(PACKAGE)-java -l maven-reporting/maven-reporting-api/pom.xml maven-reporting/maven-reporting-api/build/maven-reporting-api-$(VERSION).jar; 
+	mh_installjar -plib$(PACKAGE)-java -l maven-script/maven-script-ant/pom.xml maven-script/maven-script-ant/build/maven-script-ant-$(VERSION).jar; 
+	mh_installjar -plib$(PACKAGE)-java -l maven-script/maven-script-beanshell/pom.xml maven-script/maven-script-beanshell/build/maven-script-beanshell-$(VERSION).jar; 
+
+clean::
+	-rm -rf debian/tmp
+
+# No documentation released yet.
+#binary-post-install/$(PACKAGE)-doc::
+


Property changes on: trunk/trunk/maven2-core/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/trunk/maven2-core/debian/watch
===================================================================
--- trunk/trunk/maven2-core/debian/watch	                        (rev 0)
+++ trunk/trunk/maven2-core/debian/watch	2009-06-11 13:33:04 UTC (rev 8415)
@@ -0,0 +1,4 @@
+version=3
+opts=uversionmangle=s/-RC/~RC/ \
+  http://svn.apache.org/repos/asf/maven/components/tags/ \
+  maven-([0-9].*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list