[pkg-java] r9059 - in trunk/maven2/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Fri Jul 10 00:27:13 UTC 2009
Author: ludovicc-guest
Date: 2009-07-10 00:27:11 +0000 (Fri, 10 Jul 2009)
New Revision: 9059
Added:
trunk/maven2/debian/components.xml
trunk/maven2/debian/maven.rules
trunk/maven2/debian/maven2.poms
trunk/maven2/debian/mvnDebug.1
trunk/maven2/debian/orig-tar.sh
trunk/maven2/debian/patches/build.patch
trunk/maven2/debian/patches/pom.patch
trunk/maven2/debian/patches/series
Removed:
trunk/maven2/debian/META-INF/
trunk/maven2/debian/build.xml
trunk/maven2/debian/m2.1
Modified:
trunk/maven2/debian/
trunk/maven2/debian/build.properties
trunk/maven2/debian/changelog
trunk/maven2/debian/compat
trunk/maven2/debian/control
trunk/maven2/debian/maven2.install
trunk/maven2/debian/maven2.links
trunk/maven2/debian/maven2.manpages
trunk/maven2/debian/mvn.1
trunk/maven2/debian/patches/mvn-cmd.patch
trunk/maven2/debian/rules
trunk/maven2/debian/watch
Log:
* New upstream version
* Added myself to Uploaders.
* Change section to java, bump Standards-Version to 3.8.1
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Move ant to Build-Depends (needed for clean target)
* Add dependency on java runtimes for the maven2 binary.
* Change the dependency on java-gcj to default-jdk (Closes: #526295)
* Update watch and added orig-tar.sh to download the sources,
get-orig-source in rules now uses uscan
* Use quilt to manage the patches, add a patch to use the upstream
build.xml as the build file, disabling all dependency downloading from it
* Split the package in 2 parts: maven2-core contains all libraries,
this package contains only the uber jar and the scripts
* Updated the build to use Maven and its plugins to bootstrap itself,
based on a patched version of the build.xml boostrap script provided
with Maven. In particular, it now generates properly the shaded uber-jar,
this will avoid potential class versionning conflicts for the shared
libraries used in the plugins.
* Added Build-Depends-Indep on libmaven-clean-plugin-java,
libmaven-compiler-plugin-java, libmaven-install-plugin-java,
libmaven-jar-plugin-java, libmaven-resources-plugin-java,
libmaven-shade-plugin-java and add a Recommends on those libraries.
* Remove debian/META-INF as this information is now generated by the build.
Property changes on: trunk/maven2/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/maven2/debian/build.properties
===================================================================
--- trunk/maven2/debian/build.properties 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/build.properties 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,10 +1,16 @@
+maven.home = debian/tmp/maven-${version}
classpath.compile = \
+ /usr/share/java/backport-util-concurrent.jar:\
/usr/share/java/doxia-sink-api.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-container-default.jar:\
- /usr/share/java/plexus-interactivity-api.jar:\
- /usr/share/java/plexus-utils.jar:\
- /usr/share/java/wagon-provider-api.jar
+ /usr/share/java/commons-cli.jar:\
+ /usr/share/java/junit.jar:\
+ /usr/share/java/modello-core.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
+
Deleted: trunk/maven2/debian/build.xml
===================================================================
--- trunk/maven2/debian/build.xml 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/build.xml 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- This build.xml file was written for the Debian project.
- This file copyright (c) Paul Cager <paul-debian at home.paulcager.org>
-
- This software and documentation is provided "as is," and
- the copyright holders and contributing author(s) make no
- representations or warranties, express or implied, including
- but not limited to, warranties of merchantability or fitness
- for any particular purpose or that the use of the software or
- documentation will not infringe any third party patents,
- copyrights, trademarks or other rights.
-
- The copyright holders and contributing author(s) will not be
- liable for any direct, indirect, special or consequential damages
- arising out of any use of the software or documentation, even if
- advised of the possibility of such damage.
-
- Permission is hereby granted to use, copy, modify, and distribute
- this source code, or portions hereof, documentation and executables,
- for any purpose, without fee, subject to the following restrictions:
-
- 1. The origin of this source code must not be misrepresented.
- 2. Altered versions must be plainly marked as such and must
- not be misrepresented as being the original source.
- 3. This Copyright notice may not be removed or altered from any
- source or altered source distribution.
--->
-
-<project name="pkg-java" default="package" basedir="..">
-
-<target name="package" depends="jar,javadoc"/>
-
- <property file="debian/build.properties"/>
- <property name="maven.mainSourceRoots" value="maven-monitor/src/main/java:maven-core/src/main/java:maven-artifact/src/main/java:maven-error-diagnostics/src/main/java:maven-profile/src/main/java:maven-settings/src/main/java:maven-plugin-registry/src/main/java:maven-plugin-api/src/main/java:maven-artifact-manager/src/main/java:maven-project/src/main/java:bootstrap/bootstrap-mini/src/main/java:bootstrap/bootstrap-installer/src/main/java:maven-reporting/maven-reporting-api/src/main/java:maven-plugin-descriptor/src/main/java:maven-artifact-test/src/main/java:maven-toolchain/src/main/java"/>
- <property name="maven.generatedSourceRoots" value="maven-plugin-parameter-documenter/build/generated-sources:maven-repository-metadata/build/generated-sources:maven-model/build/generated-sources:maven-profile/build/generated-sources:maven-settings/build/generated-sources:maven-plugin-registry/build/generated-sources:maven-plugin-descriptor/build/generated-sources:maven-toolchain/build/generated-sources"/>
- <property name="maven.sourceRoots" value="${maven.mainSourceRoots}:${maven.generatedSourceRoots}"/>
-
-<target name="init">
- <property name="src.dir" value="."/>
- <property name="build.dir" value="build"/>
- <property name="jar.suffix" value="-${version}.jar"/>
- <property name="jar" value="${build.dir}/${package}-${version}.jar"/>
- <property name="javadoc.dir" value="${build.dir}/doc/api"/>
- <echo message="Classpath: ${java.class.path}" />
- <echo message="Compile classpath: ${classpath.compile}" />
-</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-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-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-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-repository-metadata/src/main/mdo/metadata.mdo" plugin="java" output="maven-repository-metadata/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-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="java" output="maven-model/build/generated-sources" version="4.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-model/src/main/mdo/maven.mdo" plugin="xpp3-writer" output="maven-model/build/generated-sources" version="4.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-profile/src/main/mdo/profiles.mdo" plugin="xpp3-reader" output="maven-profile/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-settings/src/main/mdo/settings.mdo" plugin="java" output="maven-settings/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-settings/src/main/mdo/settings.mdo" plugin="xpp3-writer" output="maven-settings/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-plugin-registry/plugin-registry.mdo" plugin="xpp3-reader" output="maven-plugin-registry/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-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="java" output="maven-plugin-descriptor/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-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-writer" output="maven-plugin-descriptor/build/generated-sources" version="1.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-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
- <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-writer" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
-</target>
-
-<target name="compile" depends="init, generate-sources">
- <mkdir dir="${build.dir}"/>
- <javac
- srcdir="${maven.sourceRoots}"
- classpath="${classpath.compile}"
- destdir="${build.dir}"
- debug="on">
- </javac>
-</target>
-
-<target name="jar" depends="compile">
- <delete file="${jar}"/>
-
- <!-- TODO - Need to generate the META-INF, rather than save in debian dir -->
-
- <mkdir dir="${build.dir}/META-INF"/>
-
- <copy todir="${build.dir}/META-INF">
- <fileset dir="debian/META-INF" />
- </copy>
-
- <copy todir="${build.dir}">
- <fileset dir="maven-artifact/src/main/resources" />
- <fileset dir="maven-reporting/maven-reporting-api/src/main/resources" />
- <fileset dir="maven-error-diagnostics/src/main/resources" />
- <fileset dir="maven-plugin-registry/src/main/resources" />
- <fileset dir="maven-profile/src/main/resources" />
- <fileset dir="maven-core/src/main/resources" />
- <fileset dir="maven-artifact-manager/src/main/resources" />
- <fileset dir="bootstrap/bootstrap-installer/src/main/resources" />
- <fileset dir="bootstrap/bootstrap-mini/src/main/resources" />
- <fileset dir="maven-settings/src/main/resources" />
- <fileset dir="maven-script/maven-script-ant/src/main/resources" />
- <fileset dir="maven-project/src/main/resources" />
- <fileset dir="maven-toolchain/src/main/resources" />
- </copy>
-
- <jar jarfile="${build.dir}/${package}${jar.suffix}"
- basedir="${build.dir}"/>
-</target>
-
-<target name="javadoc" depends="init">
- <!-- Are javadocs useful?
- <ant target="javadoc" antfile="${maven.build.xml}" dir="."/>
- -->
-</target>
-
-<target name="clean" depends="init">
- <delete dir="${build.dir}"/>
- <delete dir="maven-plugin-parameter-documenter/build/generated-sources"/>
- <delete dir="maven-repository-metadata/build/generated-sources"/>
- <delete dir="maven-model/build/generated-sources"/>
- <delete dir="maven-profile/build/generated-sources"/>
- <delete dir="maven-settings/build/generated-sources"/>
- <delete dir="maven-plugin-registry/build/generated-sources"/>
- <delete dir="maven-plugin-descriptor/build/generated-sources"/>
- <delete dir="maven-toolchain/build/generated-sources"/>
-</target>
-</project>
Modified: trunk/maven2/debian/changelog
===================================================================
--- trunk/maven2/debian/changelog 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/changelog 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,3 +1,31 @@
+maven2 (2.2.0-1) experimental; urgency=low
+
+ * New upstream version
+ * Added myself to Uploaders.
+ * Change section to java, bump Standards-Version to 3.8.1
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Move ant to Build-Depends (needed for clean target)
+ * Add dependency on java runtimes for the maven2 binary.
+ * Change the dependency on java-gcj to default-jdk (Closes: #526295)
+ * Update watch and added orig-tar.sh to download the sources,
+ get-orig-source in rules now uses uscan
+ * Use quilt to manage the patches, add a patch to use the upstream
+ build.xml as the build file, disabling all dependency downloading from it
+ * Split the package in 2 parts: maven2-core contains all libraries,
+ this package contains only the uber jar and the scripts
+ * Updated the build to use Maven and its plugins to bootstrap itself,
+ based on a patched version of the build.xml boostrap script provided
+ with Maven. In particular, it now generates properly the shaded uber-jar,
+ this will avoid potential class versionning conflicts for the shared
+ libraries used in the plugins.
+ * Added Build-Depends-Indep on libmaven-clean-plugin-java,
+ libmaven-compiler-plugin-java, libmaven-install-plugin-java,
+ libmaven-jar-plugin-java, libmaven-resources-plugin-java,
+ libmaven-shade-plugin-java and add a Recommends on those libraries.
+ * Remove debian/META-INF as this information is now generated by the build.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 02 Mar 2009 15:04:20 +0000
+
maven2 (2.0.9-2) unstable; urgency=low
[ Michael Koch ]
Modified: trunk/maven2/debian/compat
===================================================================
--- trunk/maven2/debian/compat 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/compat 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1 +1 @@
-5
+6
Added: trunk/maven2/debian/components.xml
===================================================================
--- trunk/maven2/debian/components.xml (rev 0)
+++ trunk/maven2/debian/components.xml 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,414 @@
+<!--
+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.
+-->
+
+<!-- Minimum version of the Maven components used only for bootstraping
+ the Maven build -->
+
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.plugin.PluginManager</role>
+ <implementation>org.apache.maven.plugin.DefaultPluginManager</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.project.path.PathTranslator</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.plugin.MavenPluginCollector</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.plugin.version.PluginVersionManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.plugin.PluginMappingManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.execution.RuntimeInformation</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.apache.maven.extension.ExtensionManager</role>
+ <implementation>org.apache.maven.extension.DefaultExtensionManager</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.apache.maven.plugin.PluginMappingManager</role>
+ <implementation>org.apache.maven.plugin.DefaultPluginMappingManager</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <!-- Duplicated from Maven core as it is used in the plugin manager -->
+ <component>
+ <role>org.apache.maven.project.path.PathTranslator</role>
+ <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
+ </component>
+ <!--
+ |
+ |
+ |
+ -->
+ <component>
+ <role>org.apache.maven.Maven</role>
+ <implementation>org.apache.maven.DefaultMaven</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnostics</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.execution.RuntimeInformation</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.apache.maven.execution.RuntimeInformation</role>
+ <implementation>org.apache.maven.execution.DefaultRuntimeInformation</implementation>
+ </component>
+ <!--
+ |
+ |MojoExecutionExceptionDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>MojoExecutionExceptionDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.MojoExecutionExceptionDiagnoser</implementation>
+ </component>
+ <!--
+ |
+ |MojoFailureExceptionDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>MojoFailureExceptionDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.MojoFailureExceptionDiagnoser</implementation>
+ </component>
+ <!--
+ |
+ |ProjectBuildDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>ProjectBuildDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.ProjectBuildDiagnoser</implementation>
+ </component>
+ <!--
+ |
+ |ProfileActivationDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>ProfileActivationDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.ProfileActivationDiagnoser</implementation>
+ </component>
+ <!--
+ |
+ |PluginConfigurationDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>PluginConfigurationDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.PluginConfigurationDiagnoser</implementation>
+ </component>
+ <!--
+ |
+ |ArtifactNotFoundDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>ArtifactNotFoundDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.ArtifactNotFoundDiagnoser</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ </requirement>
+ </requirements>
+ </component>
+ <!--
+ |
+ |ArtifactResolverDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>ArtifactResolverDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.ArtifactResolverDiagnoser</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ </requirement>
+ </requirements>
+ </component>
+ <!--
+ |
+ |InvalidArtifactDiagnoser
+ |
+ -->
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+ <role-hint>InvalidArtifactDiagnoser</role-hint>
+ <implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
+ </component>
+
+ <component>
+ <role>org.apache.maven.ConfigurationInterpolator</role>
+ <implementation>org.apache.maven.ReflectionConfigurationInterpolator</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.project.path.PathTranslator</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <!--
+ |
+ | Lifecycle executor
+ |
+ -->
+ <component>
+ <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
+ <implementation>org.apache.maven.lifecycle.DefaultLifecycleExecutor</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.plugin.PluginManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.extension.ExtensionManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.ConfigurationInterpolator</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <!-- START SNIPPET: lifecycle -->
+ <phases>
+ <phase>validate</phase>
+ <phase>initialize</phase>
+ <phase>generate-sources</phase>
+ <phase>process-sources</phase>
+ <phase>generate-resources</phase>
+ <phase>process-resources</phase>
+ <phase>compile</phase>
+ <phase>process-classes</phase>
+ <phase>generate-test-sources</phase>
+ <phase>process-test-sources</phase>
+ <phase>generate-test-resources</phase>
+ <phase>process-test-resources</phase>
+ <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
+ <phase>test</phase>
+ <phase>prepare-package</phase>
+ <phase>package</phase>
+ <phase>pre-integration-test</phase>
+ <phase>integration-test</phase>
+ <phase>post-integration-test</phase>
+ <phase>verify</phase>
+ <phase>install</phase>
+ <phase>deploy</phase>
+ </phases>
+ <!-- END SNIPPET: lifecycle -->
+ </lifecycle>
+ <lifecycle>
+ <id>clean</id>
+ <phases>
+ <phase>pre-clean</phase>
+ <phase>clean</phase>
+ <phase>post-clean</phase>
+ </phases>
+ <default-phases>
+ <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
+ </default-phases>
+ </lifecycle>
+ </lifecycles>
+ <!-- START SNIPPET: default-reports -->
+ <defaultReports>
+ </defaultReports>
+ <!-- END SNIPPET: default-reports -->
+ <!-- START SNIPPET: default-lifecycle -->
+ <!-- NOT USED, ACCORDING TO CODE.
+ <defaultPhases>
+ <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+ <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+ <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+ <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+ <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+ <package>
+ org.apache.maven.plugins:maven-jar-plugin:jar,
+ org.apache.maven.plugins:maven-source-plugin:jar
+ </package>
+ <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+ <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+ </defaultPhases>
+ -->
+ <!-- END SNIPPET: default-lifecycle -->
+ </configuration>
+ </component>
+
+ <!-- TODO: issues with the lifecycle:
+ - manually configured lifecycles will not pick up any later additions to the defaults where they are intended to extend defaults (have configuration <includeDefaults/> ?)
+ -->
+ <component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>pom</role-hint>
+ <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+ <configuration>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <!-- START SNIPPET: pom-lifecycle -->
+ <phases>
+ <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+ <deploy></deploy>
+ </phases>
+ <optional-mojos>
+ </optional-mojos>
+ <!-- END SNIPPET: pom-lifecycle -->
+ </lifecycle>
+ </lifecycles>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>jar</role-hint>
+ <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+ <configuration>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <!-- START SNIPPET: jar-lifecycle -->
+ <phases>
+ <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+ <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+ <process-test-resources>
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+ </process-test-resources>
+ <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+ <test></test>
+ <package>
+ org.apache.maven.plugins:maven-jar-plugin:jar
+ </package>
+ <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+ <deploy></deploy>
+ </phases>
+ <!-- END SNIPPET: jar-lifecycle -->
+ </lifecycle>
+ </lifecycles>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.maven.plugin.version.PluginVersionManager</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.plugin.version.DefaultPluginVersionManager</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.execution.RuntimeInformation</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
+ <role-hint>maven</role-hint>
+ <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>
+ <description>Maven Security dispatcher</description>
+ <requirements>
+ <requirement>
+ <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
+ <field-name>_cipher</field-name>
+ </requirement>
+ </requirements>
+ <configuration>
+ <_configuration-file>~/.m2/settings-security.xml</_configuration-file>
+ </configuration>
+ </component>
+ </components>
+</component-set>
Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/control 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,27 +1,26 @@
Source: maven2
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional,
- libxalan2-java, junit, libbcpg-java,
- libbcprov-java, libclassworlds-java, libcommons-cli-java,
- libdoxia-java, libmodello-java, libplexus-container-default-java,
- libplexus-interactivity-api-java, libplexus-utils-java (>=1:1.4.8), libwagon-java,
- maven-ant-helper
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.8.0
+Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends-Indep: maven-repo-helper, ant-optional, junit, libmaven-clean-plugin-java,
+ libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java,
+ libmaven-resources-plugin-java, libmaven-shade-plugin-java,
+ libmaven2-core-java, maven-ant-helper
+Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), default-jdk, ant, quilt
+Standards-Version: 3.8.1
Homepage: http://maven.apache.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2
Package: maven2
Architecture: all
-Section: devel
-Depends: libcommons-cli-java (>= 1.1-2), libjsch-java, libxalan2-java,
- libdoxia-java, libjtidy-java,
- libplexus-interactivity-api-java (>=1.0-alpha-6-2), libwagon-java,
- libplexus-utils-java (>=1:1.4.8)
+Depends: ${misc:Depends}, libmaven2-core-java,
+ default-jre (>= 1.4) | default-jre-headless (>= 1.4) | java2-runtime | java2-runtime-headless
+Recommends: libmaven-clean-plugin-java,
+ libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java,
+ libmaven-resources-plugin-java, libmaven-shade-plugin-java
Conflicts: maven2-binary
Replaces: maven2-binary
Description: Java software project management and comprehension tool
Deleted: trunk/maven2/debian/m2.1
===================================================================
--- trunk/maven2/debian/m2.1 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/m2.1 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,92 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH M2 "1" "July 2007" "m2 " "User Commands"
-.SH NAME
-m2 \- Command to start the maven system (deprecated)
-.SH DESCRIPTION
-THE m2 COMMMAND IS DEPRECATED \- PLEASE RUN mvn INSTEAD
-.PP
-usage: mvn [options] [<goal(s)>] [<phase(s)>]
-.SH OPTIONS
-.TP
-\fB\-q\fR,\-\-quiet
-Quiet output \- only show errors
-.TP
-\fB\-C\fR,\-\-strict\-checksums
-Fail the build if checksums don't match
-.TP
-\fB\-c\fR,\-\-lax\-checksums
-Warn if checksums don't match
-.TP
-\fB\-P\fR,\-\-activate\-profiles
-Comma\-delimited list of profiles to
-activate
-.TP
-\fB\-ff\fR,\-\-fail\-fast
-Stop at first failure in reactorized builds
-.TP
-\fB\-fae\fR,\-\-fail\-at\-end
-Only fail the build afterwards; allow all
-non\-impacted builds to continue
-.TP
-\fB\-B\fR,\-\-batch\-mode
-Run in non\-interactive (batch) mode
-.TP
-\fB\-fn\fR,\-\-fail\-never
-NEVER fail the build, regardless of project
-result
-.TP
-\fB\-up\fR,\-\-update\-plugins
-Synonym for cpu
-.TP
-\fB\-N\fR,\-\-non\-recursive
-Do not recurse into sub\-projects
-.TP
-\fB\-npr\fR,\-\-no\-plugin\-registry
-Don't use ~/.m2/plugin\-registry.xml for
-plugin versions
-.TP
-\fB\-U\fR,\-\-update\-snapshots
-Forces a check for updated releases and
-snapshots on remote repositories
-.TP
-\fB\-cpu\fR,\-\-check\-plugin\-updates
-Force upToDate check for any relevant
-registered plugins
-.TP
-\fB\-npu\fR,\-\-no\-plugin\-updates
-Suppress upToDate check for any relevant
-registered plugins
-.TP
-\fB\-D\fR,\-\-define
-Define a system property
-.TP
-\fB\-X\fR,\-\-debug
-Produce execution debug output
-.TP
-\fB\-e\fR,\-\-errors
-Produce execution error messages
-.TP
-\fB\-f\fR,\-\-file
-Force the use of an alternate POM file.
-.TP
-\fB\-h\fR,\-\-help
-Display help information
-.TP
-\fB\-o\fR,\-\-offline
-Work offline
-.TP
-\fB\-r\fR,\-\-reactor
-Execute goals for project found in the
-reactor
-.TP
-\fB\-s\fR,\-\-settings
-Alternate path for the user settings file
-.TP
-\fB\-v\fR,\-\-version
-Display version information
-.PP
-THE m2 COMMMAND IS DEPRECATED \- PLEASE RUN mvn INSTEAD
-.PP
-Maven version: 2.0.8
-.SH "SEE ALSO"
-.IR mvn (1)
Added: trunk/maven2/debian/maven.rules
===================================================================
--- trunk/maven2/debian/maven.rules (rev 0)
+++ trunk/maven2/debian/maven.rules 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,7 @@
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
+# force version 2.3 of Maven Clean plugin
+org.apache.maven.plugins maven-clean-plugin maven-plugin s/(.*)/2.3/
+# keep the version for all Maven plugins as versionless plugins don't work
+* * maven-plugin *
+junit junit jar s/3\..*/3.x/
+
Modified: trunk/maven2/debian/maven2.install
===================================================================
--- trunk/maven2/debian/maven2.install 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/maven2.install 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,5 +1,5 @@
apache-maven/src/bin/mvn usr/bin
-apache-maven/src/bin/m2 usr/bin
+apache-maven/src/bin/mvnDebug usr/bin
apache-maven/src/bin/m2.conf etc/maven2
apache-maven/src/conf/settings.xml /etc/maven2
Modified: trunk/maven2/debian/maven2.links
===================================================================
--- trunk/maven2/debian/maven2.links 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/maven2.links 2009-07-10 00:27:11 UTC (rev 9059)
@@ -3,24 +3,7 @@
/usr/share/maven2/conf/m2.conf /usr/share/maven2/bin/m2.conf
/usr/bin/mvn /usr/share/maven2/bin/mvn
-/usr/bin/m2 /usr/share/maven2/bin/m2
+/usr/bin/mvnDebug /usr/share/maven2/bin/mvnDebug
/usr/share/java/classworlds.jar usr/share/maven2/boot/classworlds.jar
-/usr/share/java/commons-cli.jar usr/share/maven2/lib/commons-cli.jar
-/usr/share/java/commons-cli.jar /usr/share/maven2/lib/commons-cli.jar
-/usr/share/java/doxia-sink-api.jar usr/share/maven2/lib/doxia-sink-api.jar
-/usr/share/java/jsch.jar /usr/share/maven2/lib/jsch.jar
-/usr/share/java/jtidy.jar usr/share/maven2/lib/jtidy.jar
-/usr/share/java/maven2.jar usr/share/maven2/lib/maven2.jar
-/usr/share/java/plexus-container-default.jar usr/share/maven2/lib/plexus-container-default.jar
-/usr/share/java/plexus-interactivity-api.jar usr/share/maven2/lib/plexus-interactivity-api.jar
-/usr/share/java/plexus-utils.jar usr/share/maven2/lib/plexus-utils.jar
-/usr/share/java/wagon-file.jar usr/share/maven2/lib/wagon-file.jar
-/usr/share/java/wagon-http-lightweight.jar usr/share/maven2/lib/wagon-http-lightweight.jar
-/usr/share/java/wagon-http-shared.jar usr/share/maven2/lib/wagon-http-shared.jar
-/usr/share/java/wagon-provider-api.jar usr/share/maven2/lib/wagon-provider-api.jar
-/usr/share/java/wagon-ssh-common.jar usr/share/maven2/lib/wagon-ssh-common.jar
-/usr/share/java/wagon-ssh-external.jar usr/share/maven2/lib/wagon-ssh-external.jar
-/usr/share/java/wagon-ssh.jar usr/share/maven2/lib/wagon-ssh.jar
-/usr/share/java/xml-apis.jar /usr/share/maven2/lib/xml-apis.jar
Modified: trunk/maven2/debian/maven2.manpages
===================================================================
--- trunk/maven2/debian/maven2.manpages 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/maven2.manpages 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,2 +1,2 @@
debian/mvn.1
-debian/m2.1
+debian/mvnDebug.1
Added: trunk/maven2/debian/maven2.poms
===================================================================
--- trunk/maven2/debian/maven2.poms (rev 0)
+++ trunk/maven2/debian/maven2.poms 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,2 @@
+pom.xml --no-parent
+apache-maven/pom.xml
Modified: trunk/maven2/debian/mvn.1
===================================================================
--- trunk/maven2/debian/mvn.1 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/mvn.1 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,88 +1,137 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH MAVEN "1" "July 2007" "Maven version: 2.0.8" "User Commands"
+.TH APACHE "1" "July 2009" "Apache Maven 2.2.0" "User Commands"
.SH NAME
mvn \- Command to start the Maven system
.SH DESCRIPTION
usage: mvn [options] [<goal(s)>] [<phase(s)>]
.SH OPTIONS
.TP
-\fB\-q\fR,\-\-quiet
-Quiet output \- only show errors
+\fB\-am\fR,\-\-also\-make
+If project list is specified, also
+build projects required by the
+list
.TP
+\fB\-amd\fR,\-\-also\-make\-dependents
+If project list is specified, also
+build projects that depend on
+projects on the list
+.TP
+\fB\-B\fR,\-\-batch\-mode
+Run in non\-interactive (batch)
+mode
+.TP
\fB\-C\fR,\-\-strict\-checksums
-Fail the build if checksums don't match
+Fail the build if checksums don't
+match
.TP
\fB\-c\fR,\-\-lax\-checksums
Warn if checksums don't match
.TP
-\fB\-P\fR,\-\-activate\-profiles
-Comma\-delimited list of profiles to
-activate
+\fB\-cpu\fR,\-\-check\-plugin\-updates
+Force upToDate check for any
+relevant registered plugins
.TP
-\fB\-ff\fR,\-\-fail\-fast
-Stop at first failure in reactorized builds
+\fB\-D\fR,\-\-define <arg>
+Define a system property
.TP
+\fB\-e\fR,\-\-errors
+Produce execution error messages
+.TP
+\fB\-emp\fR,\-\-encrypt\-master\-password <arg>
+Encrypt master security password
+.TP
+\fB\-ep\fR,\-\-encrypt\-password <arg>
+Encrypt server password
+.TP
+\fB\-f\fR,\-\-file
+Force the use of an alternate POM
+file.
+.TP
\fB\-fae\fR,\-\-fail\-at\-end
-Only fail the build afterwards; allow all
-non\-impacted builds to continue
+Only fail the build afterwards;
+allow all non\-impacted builds to
+continue
.TP
-\fB\-B\fR,\-\-batch\-mode
-Run in non\-interactive (batch) mode
+\fB\-ff\fR,\-\-fail\-fast
+Stop at first failure in
+reactorized builds
.TP
\fB\-fn\fR,\-\-fail\-never
-NEVER fail the build, regardless of project
-result
+NEVER fail the build, regardless
+of project result
.TP
-\fB\-up\fR,\-\-update\-plugins
-Synonym for cpu
+\fB\-gs\fR,\-\-global\-settings <arg>
+Alternate path for the global
+settings file
.TP
+\fB\-h\fR,\-\-help
+Display help information
+.TP
\fB\-N\fR,\-\-non\-recursive
Do not recurse into sub\-projects
.TP
\fB\-npr\fR,\-\-no\-plugin\-registry
-Don't use ~/.m2/plugin\-registry.xml for
+Don't use
+~/.m2/plugin\-registry.xml for
plugin versions
.TP
-\fB\-U\fR,\-\-update\-snapshots
-Forces a check for updated releases and
-snapshots on remote repositories
+\fB\-npu\fR,\-\-no\-plugin\-updates
+Suppress upToDate check for any
+relevant registered plugins
.TP
-\fB\-cpu\fR,\-\-check\-plugin\-updates
-Force upToDate check for any relevant
-registered plugins
+\fB\-o\fR,\-\-offline
+Work offline
.TP
-\fB\-npu\fR,\-\-no\-plugin\-updates
-Suppress upToDate check for any relevant
-registered plugins
+\fB\-P\fR,\-\-activate\-profiles <arg>
+Comma\-delimited list of profiles
+to activate
.TP
-\fB\-D\fR,\-\-define
-Define a system property
+\fB\-pl\fR,\-\-projects <arg>
+Build specified reactor projects
+instead of all projects
.TP
-\fB\-X\fR,\-\-debug
-Produce execution debug output
+\fB\-q\fR,\-\-quiet
+Quiet output \- only show errors
.TP
-\fB\-e\fR,\-\-errors
-Produce execution error messages
+\fB\-r\fR,\-\-reactor
+Dynamically build reactor from
+subdirectories
.TP
-\fB\-f\fR,\-\-file
-Force the use of an alternate POM file.
+\fB\-rf\fR,\-\-resume\-from <arg>
+Resume reactor from specified
+project
.TP
-\fB\-h\fR,\-\-help
-Display help information
+\fB\-s\fR,\-\-settings <arg>
+Alternate path for the user
+settings file
.TP
-\fB\-o\fR,\-\-offline
-Work offline
+\fB\-U\fR,\-\-update\-snapshots
+Forces a check for updated
+releases and snapshots on remote
+repositories
.TP
-\fB\-r\fR,\-\-reactor
-Execute goals for project found in the
-reactor
+\fB\-up\fR,\-\-update\-plugins
+Synonym for cpu
.TP
-\fB\-s\fR,\-\-settings
-Alternate path for the user settings file
+\fB\-V\fR,\-\-show\-version
+Display version information
+WITHOUT stopping build
.TP
\fB\-v\fR,\-\-version
Display version information
+.TP
+\fB\-X\fR,\-\-debug
+Produce execution debug output
+.PP
.SH "SEE ALSO"
The full documentation for
-.B Maven
-is available at http://maven.apache.org/
+.B Apache
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B Apache
+programs are properly installed at your site, the command
+.IP
+.B info Apache
+.PP
+should give you access to the complete manual.
Added: trunk/maven2/debian/mvnDebug.1
===================================================================
--- trunk/maven2/debian/mvnDebug.1 (rev 0)
+++ trunk/maven2/debian/mvnDebug.1 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,137 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH APACHE "1" "July 2009" "Apache Maven 2.2.0" "User Commands"
+.SH NAME
+mvnDebug \- Command to start the Maven system in Debug mode
+.SH DESCRIPTION
+usage: mvn [options] [<goal(s)>] [<phase(s)>]
+.SH OPTIONS
+.TP
+\fB\-am\fR,\-\-also\-make
+If project list is specified, also
+build projects required by the
+list
+.TP
+\fB\-amd\fR,\-\-also\-make\-dependents
+If project list is specified, also
+build projects that depend on
+projects on the list
+.TP
+\fB\-B\fR,\-\-batch\-mode
+Run in non\-interactive (batch)
+mode
+.TP
+\fB\-C\fR,\-\-strict\-checksums
+Fail the build if checksums don't
+match
+.TP
+\fB\-c\fR,\-\-lax\-checksums
+Warn if checksums don't match
+.TP
+\fB\-cpu\fR,\-\-check\-plugin\-updates
+Force upToDate check for any
+relevant registered plugins
+.TP
+\fB\-D\fR,\-\-define <arg>
+Define a system property
+.TP
+\fB\-e\fR,\-\-errors
+Produce execution error messages
+.TP
+\fB\-emp\fR,\-\-encrypt\-master\-password <arg>
+Encrypt master security password
+.TP
+\fB\-ep\fR,\-\-encrypt\-password <arg>
+Encrypt server password
+.TP
+\fB\-f\fR,\-\-file
+Force the use of an alternate POM
+file.
+.TP
+\fB\-fae\fR,\-\-fail\-at\-end
+Only fail the build afterwards;
+allow all non\-impacted builds to
+continue
+.TP
+\fB\-ff\fR,\-\-fail\-fast
+Stop at first failure in
+reactorized builds
+.TP
+\fB\-fn\fR,\-\-fail\-never
+NEVER fail the build, regardless
+of project result
+.TP
+\fB\-gs\fR,\-\-global\-settings <arg>
+Alternate path for the global
+settings file
+.TP
+\fB\-h\fR,\-\-help
+Display help information
+.TP
+\fB\-N\fR,\-\-non\-recursive
+Do not recurse into sub\-projects
+.TP
+\fB\-npr\fR,\-\-no\-plugin\-registry
+Don't use
+~/.m2/plugin\-registry.xml for
+plugin versions
+.TP
+\fB\-npu\fR,\-\-no\-plugin\-updates
+Suppress upToDate check for any
+relevant registered plugins
+.TP
+\fB\-o\fR,\-\-offline
+Work offline
+.TP
+\fB\-P\fR,\-\-activate\-profiles <arg>
+Comma\-delimited list of profiles
+to activate
+.TP
+\fB\-pl\fR,\-\-projects <arg>
+Build specified reactor projects
+instead of all projects
+.TP
+\fB\-q\fR,\-\-quiet
+Quiet output \- only show errors
+.TP
+\fB\-r\fR,\-\-reactor
+Dynamically build reactor from
+subdirectories
+.TP
+\fB\-rf\fR,\-\-resume\-from <arg>
+Resume reactor from specified
+project
+.TP
+\fB\-s\fR,\-\-settings <arg>
+Alternate path for the user
+settings file
+.TP
+\fB\-U\fR,\-\-update\-snapshots
+Forces a check for updated
+releases and snapshots on remote
+repositories
+.TP
+\fB\-up\fR,\-\-update\-plugins
+Synonym for cpu
+.TP
+\fB\-V\fR,\-\-show\-version
+Display version information
+WITHOUT stopping build
+.TP
+\fB\-v\fR,\-\-version
+Display version information
+.TP
+\fB\-X\fR,\-\-debug
+Produce execution debug output
+.PP
+.SH "SEE ALSO"
+The full documentation for
+.B Apache
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B Apache
+programs are properly installed at your site, the command
+.IP
+.B info Apache
+.PP
+should give you access to the complete manual.
Added: trunk/maven2/debian/orig-tar.sh
===================================================================
--- trunk/maven2/debian/orig-tar.sh (rev 0)
+++ trunk/maven2/debian/orig-tar.sh 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../maven2_$VERSION.orig.tar.gz
+DIR=maven2-$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
+# remove the maven- code as it is built in the package maven2-core
+rm -r $DIR/maven-*
+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
Property changes on: trunk/maven2/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/maven2/debian/patches/build.patch
===================================================================
--- trunk/maven2/debian/patches/build.patch (rev 0)
+++ trunk/maven2/debian/patches/build.patch 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,195 @@
+--- a/build.xml
++++ b/build.xml
+@@ -33,21 +33,16 @@
+
+ -->
+
+-<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
++<project default="all" basedir=".">
+
+- <target name="initTaskDefs" unless="taskdefs.inited">
+- <xmlproperty file="pom.xml" prefix="pom.xml" />
+- <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/>
+- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath"/>
+- <property name="taskdefs.inited" value="true"/>
+- </target>
++ <property file="debian/build.properties" />
+
+ <target name="initLocalRepo">
+ <property name="maven.repo.local" location="${user.home}/.m2/repository"/>
+ <echo>Using the local repository at: ${maven.repo.local}</echo>
+ </target>
+
+- <target name="isMavenHomeSet" depends="initTaskDefs">
++ <target name="isMavenHomeSet">
+ <property environment="env"/>
+ <condition property="maven.home" value="${env.M2_HOME}">
+ <isset property="env.M2_HOME"/>
+@@ -65,22 +60,13 @@
+ <echo>Using Maven home at: ${maven.home}</echo>
+ </target>
+
+- <target name="read-poms" depends="initTaskDefs,initLocalRepo" unless="pom.version">
+- <copy file="pom.xml" tofile="dependencies.xml"/>
+- <replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/>
+- <replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/>
+- <artifact:pom file="${basedir}/dependencies.xml" id="pom">
+- <localRepository path="${maven.repo.local}"/>
+- </artifact:pom>
+- <delete file="${basedir}/dependencies.xml"/>
+-
+- <artifact:pom file="${basedir}/maven-integration-tests/pom.xml" id="itPom">
+- <localRepository path="${maven.repo.local}"/>
+- </artifact:pom>
+- </target>
+-
+ <target name="init" depends="isMavenHomeSet,initLocalRepo">
+- <xmlproperty prefix="pom" file="pom.xml"/>
++ <xmlproperty file="pom.xml" prefix="pom" />
++ <property name="pom.version" value="${pom.project.version}" />
++ <xmlproperty file="${basedir}/maven-integration-tests/pom.xml" prefix="itPom" />
++ <property name="itPom.artifactId" value="${itPom.project.artifactId}" />
++ <property name="itPom.version" value="${itPom.project.version}" />
++ <path id="pom.pathid" path="${classpath.compile}" />
+ <basename file="${maven.home}" property="maven.home.basename"/>
+ <dirname file="${maven.home}" property="maven.home.dirname"/>
+ <!-- Initialize properties -->
+@@ -88,6 +74,7 @@
+ <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
+ <property name="surefire.useFile" value="true"/>
+ <echo>maven.home = ${maven.home}</echo>
++ <echo>maven.repo.local = ${maven.repo.local}</echo>
+ <echo>maven.assembly = ${maven.assembly}</echo>
+ </target>
+
+@@ -95,44 +82,8 @@
+ <delete dir="bootstrap"/>
+ </target>
+
+- <target name="pull" depends="init, read-poms" unless="skip.pull">
+- <property name="verbose" value="false"/>
+- <!-- Pull the dependencies that Maven needs to build -->
+- <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
+- <localRepository path="${maven.repo.local}"/>
+- <pom refid="pom"/>
+- </artifact:dependencies>
+-
+- <!-- Pull the dependencies for Modello -->
+- <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
+- <localRepository path="${maven.repo.local}"/>
+- <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/>
+- <dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/>
+- </artifact:dependencies>
+- </target>
+-
+- <target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files">
+- <mkdir dir="bootstrap/target"/>
+- <mkdir dir="bootstrap/target/generated-sources"/>
+-
+- <macrodef name="modello-single-mode">
+- <attribute name="file"/>
+- <attribute name="mode"/>
+- <attribute name="version"/>
+- <sequential>
+- <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true">
+- <classpath refid="modello.pathid"/>
+- <arg file="@{file}"/> <!-- model file -->
+- <arg value="@{mode}"/> <!-- output type -->
+- <arg file="bootstrap/target/generated-sources"/> <!-- output directory -->
+- <arg value="@{version}"/> <!-- model version -->
+- <arg value="false"/> <!-- package with version -->
+- <arg value="true"/> <!-- use Java 5 -->
+- <arg value="UTF-8"/> <!-- encoding -->
+- </java>
+- </sequential>
+- </macrodef>
+-
++ <target name="generate-sources" description="generates Java sources from Modello mdo model files" />
++<!--
+ <macrodef name="modello">
+ <attribute name="file"/>
+ <attribute name="version" default="1.0.0"/>
+@@ -154,8 +105,9 @@
+ <modello file="maven-toolchain/src/main/mdo/toolchains.mdo"/>
+
+ </target>
+-
++-->
+ <target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources">
++<!--
+ <path id="sources">
+ <dirset dir=".">
+ <include name="bootstrap/target/generated-sources"/>
+@@ -170,16 +122,49 @@
+ <src refid="sources"/>
+ <classpath refid="pom.pathid"/>
+ </javac>
+-
++-->
+ <!-- DGF generating a fake pom.properties so Maven thinks it has a version number -->
++<!--
+ <mkdir dir="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core"/>
+ <echo message="version=${pom.project.version}"
+ file="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"/>
+-
++-->
+ <path id="maven.classpath">
+- <pathelement location="bootstrap/target/classes"/>
+- <path refid="sources"/>
+- <path refid="pom.pathid"/>
++ <pathelement location="debian/tmp/bootstrap"/>
++ <fileset dir="/usr/share/maven-repo">
++ <include name="backport-util-concurrent/backport-util-concurrent/debian/backport-util-concurrent-debian.jar"/>
++ <include name="classworlds/classworlds/debian/classworlds-debian.jar"/>
++ <include name="com/jcraft/jsch/debian/jsch-debian.jar"/>
++ <include name="commons-cli/commons-cli/debian/commons-cli-debian.jar"/>
++ <include name="junit/junit/debian/junit-debian.jar"/>
++ <include name="org/apache/maven/doxia/doxia-logging-api/debian/doxia-logging-api-debian.jar"/>
++ <include name="org/apache/maven/doxia/doxia-sink-api/debian/doxia-sink-api-debian.jar"/>
++ <include name="org/apache/maven/maven-artifact/debian/maven-artifact-debian.jar"/>
++ <include name="org/apache/maven/maven-artifact-manager/debian/maven-artifact-manager-debian.jar"/>
++ <include name="org/apache/maven/maven-compat/debian/maven-compat-debian.jar"/>
++ <include name="org/apache/maven/maven-core/debian/maven-core-debian.jar"/>
++ <include name="org/apache/maven/maven-error-diagnostics/debian/maven-error-diagnostics-debian.jar"/>
++ <include name="org/apache/maven/maven-model/debian/maven-model-debian.jar"/>
++ <include name="org/apache/maven/maven-monitor/debian/maven-monitor-debian.jar"/>
++ <include name="org/apache/maven/maven-plugin-api/debian/maven-plugin-api-debian.jar"/>
++ <include name="org/apache/maven/maven-plugin-descriptor/debian/maven-plugin-descriptor-debian.jar"/>
++ <include name="org/apache/maven/maven-plugin-parameter-documenter/debian/maven-plugin-parameter-documenter-debian.jar"/>
++ <include name="org/apache/maven/maven-plugin-registry/debian/maven-plugin-registry-debian.jar"/>
++ <include name="org/apache/maven/maven-profile/debian/maven-profile-debian.jar"/>
++ <include name="org/apache/maven/maven-project/debian/maven-project-debian.jar"/>
++ <include name="org/apache/maven/maven-repository-metadata/debian/maven-repository-metadata-debian.jar"/>
++ <include name="org/apache/maven/maven-settings/debian/maven-settings-debian.jar"/>
++ <include name="org/apache/maven/reporting/maven-reporting-api/debian/maven-reporting-api-debian.jar"/>
++ <include name="org/apache/maven/wagon/wagon-provider-api/debian/wagon-provider-api-debian.jar"/>
++ <include name="org/apache/maven/wagon/wagon-ssh-common/debian/wagon-ssh-common-debian.jar"/>
++ <include name="org/apache/maven/wagon/wagon-ssh/debian/wagon-ssh-debian.jar"/>
++ <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.jar"/>
++ <include name="org/codehaus/plexus/plexus-interactivity-api/debian/plexus-interactivity-api-debian.jar"/>
++ <include name="org/codehaus/plexus/plexus-interpolation/debian/plexus-interpolation-debian.jar"/>
++ <include name="org/codehaus/plexus/plexus-utils/debian/plexus-utils-debian.jar"/>
++ <include name="org/sonatype/plexus/plexus-cipher/debian/plexus-cipher-debian.jar"/>
++ <include name="org/sonatype/plexus/plexus-sec-dispatcher/debian/plexus-sec-dispatcher-debian.jar"/>
++ </fileset>
+ </path>
+ </target>
+
+@@ -193,6 +178,7 @@
+ <jvmarg value="-Djava.compiler=NONE"/> -->
+
+ <classpath refid="maven.classpath"/>
++ <arg value="--offline"/>
+ <arg value="-e"/>
+ <arg value="-B"/>
+ <arg value="clean"/>
+@@ -314,9 +300,4 @@
+
+ <target name="with-its" depends="all,run-its"/>
+
+- <target name="set-temp-maven-home" depends="read-poms">
+- <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${pom.version}"/>
+- <echo>Using temporary maven install directory: ${maven.home}</echo>
+- </target>
+-
+ </project>
Modified: trunk/maven2/debian/patches/mvn-cmd.patch
===================================================================
--- trunk/maven2/debian/patches/mvn-cmd.patch 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/patches/mvn-cmd.patch 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,7 +1,6 @@
-diff -Nur maven2-2.0.7/maven-core/src/bin/mvn maven2-2.0.7.new/maven-core/src/bin/mvn
---- maven2-2.0.7/apache-maven/src/bin/mvn 2007-03-25 06:06:10.000000000 +0100
-+++ maven2-2.0.7.new/apache-maven/src/bin/mvn 2007-10-28 14:05:21.000000000 +0000
-@@ -72,9 +72,80 @@
+--- a/apache-maven/src/bin/mvn
++++ b/apache-maven/src/bin/mvn
+@@ -68,9 +68,80 @@
;;
esac
@@ -82,7 +81,7 @@
fi
fi
-@@ -160,7 +231,7 @@
+@@ -156,7 +227,7 @@
exec "$JAVACMD" \
$MAVEN_OPTS \
Added: trunk/maven2/debian/patches/pom.patch
===================================================================
--- trunk/maven2/debian/patches/pom.patch (rev 0)
+++ trunk/maven2/debian/patches/pom.patch 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,111 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -20,13 +20,7 @@
+ <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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+- <parent>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-parent</artifactId>
+- <version>11</version>
+- <relativePath>../pom/maven/pom.xml</relativePath>
+- </parent>
+-
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
+ <version>2.2.0</version>
+ <packaging>pom</packaging>
+@@ -121,6 +115,7 @@
+ <url>http://svn.apache.org/viewvc/maven/components/tags/maven-2.2.0</url>
+ </scm>
+
++<!-- disable build section -
+ <build>
+ <pluginManagement>
+ <plugins>
+@@ -214,7 +209,7 @@
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+- <!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
++ <- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT ->
+ <comparisonVersion>2.1.0</comparisonVersion>
+ <excludes>
+ <exclude>org/apache/maven/project/artifact/ArtifactWithProject*</exclude>
+@@ -248,8 +243,10 @@
+ </plugin>
+ </plugins>
+ </build>
++-->
+
+ <modules>
++<!-- keep only the modules required for the build -
+ <module>maven-artifact</module>
+ <module>maven-artifact-manager</module>
+ <module>maven-artifact-test</module>
+@@ -269,6 +266,7 @@
+ <module>maven-script</module>
+ <module>maven-settings</module>
+ <module>maven-toolchain</module>
++-->
+ <module>apache-maven</module>
+ </modules>
+
+--- a/apache-maven/pom.xml
++++ b/apache-maven/pom.xml
+@@ -32,19 +32,8 @@
+ <build>
+ <plugins>
+ <plugin>
+- <artifactId>maven-surefire-plugin</artifactId>
+- <configuration>
+- <systemProperties>
+- <property>
+- <name>basedir</name>
+- <value>${basedir}</value>
+- </property>
+- </systemProperties>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+- <version>1.2</version>
++ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+@@ -60,8 +49,17 @@
+ true
+ </keepDependenciesWithProvidedScope>
+ <transformers>
+- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
++ <org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer />
+ </transformers>
++ <filters>
++ <!-- remove the META-INF/services folder from xerces as we want to use the default Jdk-provided services -->
++ <filter>
++ <artifact>xerces:xercesImpl</artifact>
++ <excludes>
++ <exclude>META-INF/services/**</exclude>
++ </excludes>
++ </filter>
++ </filters>
+ <artifactSet>
+ <excludes>
+ <exclude>
+@@ -122,6 +120,7 @@
+ </execution>
+ </executions>
+ </plugin>
++<!-- disable the assembly plugin -
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+@@ -140,6 +139,7 @@
+ </execution>
+ </executions>
+ </plugin>
++-->
+ </plugins>
+ </build>
+
Added: trunk/maven2/debian/patches/series
===================================================================
--- trunk/maven2/debian/patches/series (rev 0)
+++ trunk/maven2/debian/patches/series 2009-07-10 00:27:11 UTC (rev 9059)
@@ -0,0 +1,3 @@
+mvn-cmd.patch
+build.patch
+pom.patch
Modified: trunk/maven2/debian/rules
===================================================================
--- trunk/maven2/debian/rules 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/rules 2009-07-10 00:27:11 UTC (rev 9059)
@@ -2,34 +2,42 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | sed 's/-[0-9\.]*$$//')
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
-
-
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE := ./debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-#DEB_ANT_INVOKE := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-trax
+DEB_ANT_BUILD_TARGET := maven-compile
+DEB_ANT_BUILDFILE := build.xml
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dmaven.repo.local=$(realpath $(DEB_BUILDDIR))/debian/tmp/maven-repo
API_DOCS := build/doc/api
-SVN := http://svn.apache.org/repos/asf/maven/components/tags/maven-$(VERSION)
+BASE_MODULES := apache-maven maven-artifact-manager 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:
- echo "Getting version $(VERSION) from $(SVN)"
- mkdir orig_tmp
- cd orig_tmp && \
- svn export -q $(SVN) maven && \
- tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz maven
- rm -rf orig_tmp
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+configure/$(PACKAGE)::
+ mh_patchpoms -p$(PACKAGE)
+
+makebuilddir/$(PACKAGE)::
+ install -d $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus
+ install debian/components.xml $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus/
+ install -d $(DEB_BUILDDIR)/debian/tmp/maven-repo
+ cp -rL /usr/share/maven-repo/* $(DEB_BUILDDIR)/debian/tmp/maven-repo/
+
binary-post-install/$(PACKAGE)::
- dh_install -p$(PACKAGE) build/$(PACKAGE)-$(VERSION).jar usr/share/java
- dh_link -p$(PACKAGE) usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
+ dh_install -p$(PACKAGE) apache-maven/target/maven-debian-uber.jar usr/share/maven2/lib/
+clean::
+ mh_unpatchpoms -p$(PACKAGE)
+ -rm -rf debian/tmp/mvn-repo
+ -find . -name target -type d | xargs rm -rf
+
# No documentation released yet.
#binary-post-install/$(PACKAGE)-doc::
Property changes on: trunk/maven2/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
Modified: trunk/maven2/debian/watch
===================================================================
--- trunk/maven2/debian/watch 2009-07-09 23:57:43 UTC (rev 9058)
+++ trunk/maven2/debian/watch 2009-07-10 00:27:11 UTC (rev 9059)
@@ -1,5 +1,4 @@
version=3
-# The "." at the end of the pattern will always be a "/", but
-# uscan does not allow us to specify a "/"
opts=uversionmangle=s/-RC/~RC/ \
-http://svn.apache.org/repos/asf/maven/components/tags/maven-([0-9].*). debian uupdate
+ http://svn.apache.org/repos/asf/maven/components/tags/ \
+ maven-(2.*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list