[pkg-java] r7557 - in trunk/maven-clean-plugin/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Dec 7 00:15:14 UTC 2008
Author: twerner
Date: 2008-12-07 00:15:13 +0000 (Sun, 07 Dec 2008)
New Revision: 7557
Added:
trunk/maven-clean-plugin/debian/maven-settings.xml
trunk/maven-clean-plugin/debian/patches/
trunk/maven-clean-plugin/debian/patches/pom.diff
trunk/maven-clean-plugin/debian/patches/series
Modified:
trunk/maven-clean-plugin/debian/
trunk/maven-clean-plugin/debian/build.xml
trunk/maven-clean-plugin/debian/changelog
trunk/maven-clean-plugin/debian/control
trunk/maven-clean-plugin/debian/rules
Log:
package builds locally
Property changes on: trunk/maven-clean-plugin/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/maven-clean-plugin/debian/build.xml
===================================================================
--- trunk/maven-clean-plugin/debian/build.xml 2008-12-07 00:07:10 UTC (rev 7556)
+++ trunk/maven-clean-plugin/debian/build.xml 2008-12-07 00:15:13 UTC (rev 7557)
@@ -2,25 +2,34 @@
<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"/>
+ <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"/>
- <target name="clean">
- <ant target="clean" antfile="${maven.build.xml}" dir="."/>
- </target>
+ <target name="clean">
+ <ant target="clean" antfile="${maven.build.xml}" dir="."/>
+ </target>
- <target name="package">
- <ant target="package" antfile="${maven.build.xml}" dir=".">
- <property name="artifactId" value="maven-clean-plugin"/>
- </ant>
- </target>
+ <target name="package">
+ <java classname="org.codehaus.classworlds.Launcher"
+ classpath="/usr/share/maven2/boot/classworlds.jar"
+ failonerror="true" fork="true">
+ <sysproperty key="classworlds.conf" value="/etc/maven2/m2.conf"/>
+ <sysproperty key="maven.home" value="/usr/share/maven2"/>
+ <arg value="-Dmaven.test.skip"/>
+ <arg value="-s${basedir}/debian/maven-settings.xml"/>
+ <arg value="plugin:descriptor"/>
+ </java>
+ <ant target="package" antfile="${maven.build.xml}" dir=".">
+ <property name="artifactId" value="maven-clean-plugin"/>
+ </ant>
+ </target>
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="src/main/java/"/>
- </javadoc>
- </target>
+ <target name="javadoc">
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="src/main/java/"/>
+ </javadoc>
+ </target>
</project>
Modified: trunk/maven-clean-plugin/debian/changelog
===================================================================
--- trunk/maven-clean-plugin/debian/changelog 2008-12-07 00:07:10 UTC (rev 7556)
+++ trunk/maven-clean-plugin/debian/changelog 2008-12-07 00:15:13 UTC (rev 7557)
@@ -1,6 +1,6 @@
maven-clean-plugin (2.2-1) unstable; urgency=low
UNRELEASED
- * Initial release. (Closes: #xxxxxx)
+ * Initial release. (Closes: #508020)
-- Torsten Werner <twerner at debian.org> Thu, 04 Dec 2008 19:29:26 +0100
Modified: trunk/maven-clean-plugin/debian/control
===================================================================
--- trunk/maven-clean-plugin/debian/control 2008-12-07 00:07:10 UTC (rev 7556)
+++ trunk/maven-clean-plugin/debian/control 2008-12-07 00:15:13 UTC (rev 7557)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, maven-ant-helper,
+Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper,
libmaven-file-management-java
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-clean-plugin
Added: trunk/maven-clean-plugin/debian/maven-settings.xml
===================================================================
--- trunk/maven-clean-plugin/debian/maven-settings.xml (rev 0)
+++ trunk/maven-clean-plugin/debian/maven-settings.xml 2008-12-07 00:15:13 UTC (rev 7557)
@@ -0,0 +1,4 @@
+<settings>
+ <localRepository>/usr/share/maven-repo</localRepository>
+ <offline>true</offline>
+</settings>
Added: trunk/maven-clean-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-clean-plugin/debian/patches/pom.diff (rev 0)
+++ trunk/maven-clean-plugin/debian/patches/pom.diff 2008-12-07 00:15:13 UTC (rev 7557)
@@ -0,0 +1,63 @@
+Index: maven-clean-plugin-2.2/pom.xml
+===================================================================
+--- maven-clean-plugin-2.2.orig/pom.xml 2007-11-30 00:33:21.000000000 +0100
++++ maven-clean-plugin-2.2/pom.xml 2008-12-07 01:12:27.000000000 +0100
+@@ -21,13 +21,16 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
++ <!--
+ <parent>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugins</artifactId>
+ <version>10</version>
+ </parent>
++ -->
+
+ <artifactId>maven-clean-plugin</artifactId>
++ <groupId>org.apache.maven.plugins</groupId>
+ <version>2.2</version>
+ <packaging>maven-plugin</packaging>
+ <name>Maven Clean Plugin</name>
+@@ -46,6 +49,7 @@
+ </issueManagement>
+
+ <dependencies>
++ <!--
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+@@ -66,6 +70,7 @@
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1</version>
+ </dependency>
++ -->
+
+ <!-- Test -->
+ <dependency>
+@@ -83,7 +88,17 @@
+ </contributors>
+
+ <build>
++ <pluginManagement>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-plugin-plugin</artifactId>
++ <version>2.4.3</version>
++ </plugin>
++ </plugins>
++ </pluginManagement>
+ <plugins>
++ <!--
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+@@ -92,6 +107,7 @@
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ </plugin>
++ -->
+ </plugins>
+ </build>
+
Added: trunk/maven-clean-plugin/debian/patches/series
===================================================================
--- trunk/maven-clean-plugin/debian/patches/series (rev 0)
+++ trunk/maven-clean-plugin/debian/patches/series 2008-12-07 00:15:13 UTC (rev 7557)
@@ -0,0 +1 @@
+pom.diff
Modified: trunk/maven-clean-plugin/debian/rules
===================================================================
--- trunk/maven-clean-plugin/debian/rules 2008-12-07 00:07:10 UTC (rev 7556)
+++ trunk/maven-clean-plugin/debian/rules 2008-12-07 00:15:13 UTC (rev 7557)
@@ -2,11 +2,12 @@
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 := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := maven2 maven-file-management plexus-utils
+DEB_JARS := maven2 file-management plexus-utils
DEB_ANT_BUILD_TARGET := package #javadoc
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -Dversion=$(VERSION)
More information about the pkg-java-commits
mailing list