[pkg-java] r7617 - in trunk/maven-jar-plugin/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Tue Dec 9 22:10:30 UTC 2008
Author: twerner
Date: 2008-12-09 22:10:29 +0000 (Tue, 09 Dec 2008)
New Revision: 7617
Added:
trunk/maven-jar-plugin/debian/patches/
trunk/maven-jar-plugin/debian/patches/pom.diff
trunk/maven-jar-plugin/debian/patches/series
Modified:
trunk/maven-jar-plugin/debian/
trunk/maven-jar-plugin/debian/build.xml
trunk/maven-jar-plugin/debian/control
trunk/maven-jar-plugin/debian/rules
Log:
package builds now
Property changes on: trunk/maven-jar-plugin/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/maven-jar-plugin/debian/build.xml
===================================================================
--- trunk/maven-jar-plugin/debian/build.xml 2008-12-09 21:37:13 UTC (rev 7616)
+++ trunk/maven-jar-plugin/debian/build.xml 2008-12-09 22:10:29 UTC (rev 7617)
@@ -18,6 +18,7 @@
<arg value="-Dmaven.test.skip"/>
<arg value="-s${basedir}/debian/maven-settings.xml"/>
<arg value="plugin:descriptor"/>
+ <arg value="-e"/>
</java>
<ant target="package" antfile="${maven.build.xml}" dir=".">
<property name="artifactId" value="maven-jar-plugin"/>
Modified: trunk/maven-jar-plugin/debian/control
===================================================================
--- trunk/maven-jar-plugin/debian/control 2008-12-09 21:37:13 UTC (rev 7616)
+++ trunk/maven-jar-plugin/debian/control 2008-12-09 22:10:29 UTC (rev 7617)
@@ -3,7 +3,10 @@
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, quilt, maven-ant-helper
+Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper,
+ maven2, libmaven-archiver-java, libplexus-archiver-java, libplexus-utils-java,
+ libcommons-lang-java, libplexus-containers-java, libmaven-plugin-tools-java,
+ libplexus-interpolation-java
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-jar-plugin
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-jar-plugin/
@@ -12,7 +15,9 @@
Package: libmaven-jar-plugin-java
Architecture: all
Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime, libmaven-plugin-tools-java
+Depends: ${misc:Depends}, default-jre | java2-runtime, maven2, libmaven-archiver-java,
+ libplexus-archiver-java, libplexus-utils-java, libcommons-lang-java,
+ libplexus-containers-java
Description: Maven Jar plugin
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,
Added: trunk/maven-jar-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-jar-plugin/debian/patches/pom.diff (rev 0)
+++ trunk/maven-jar-plugin/debian/patches/pom.diff 2008-12-09 22:10:29 UTC (rev 7617)
@@ -0,0 +1,109 @@
+Index: maven-jar-plugin-2.2/pom.xml
+===================================================================
+--- maven-jar-plugin-2.2.orig/pom.xml 2008-12-09 22:47:31.000000000 +0100
++++ maven-jar-plugin-2.2/pom.xml 2008-12-09 22:19:48.000000000 +0100
+@@ -18,11 +18,14 @@
+ under the License.
+ -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
++ <!--
+ <parent>
+ <artifactId>maven-plugins</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>10</version>
+ </parent>
++ -->
++ <groupId>org.apache.maven.plugins</groupId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-jar-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+@@ -59,18 +62,23 @@
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+- <version>2.0.6</version>
++ <version>2.0.9</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/maven2.jar</systemPath>
+ </dependency>
++ <!--
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.7</version>
+ </dependency>
++ -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.3</version>
+ </dependency>
++ <!--
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+@@ -101,15 +109,20 @@
+ </exclusion>
+ </exclusions>
+ </dependency>
++ -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/commons-lang.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.9</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+@@ -120,7 +133,22 @@
+ </dependencies>
+
+ <build>
++ <pluginManagement>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-plugin-plugin</artifactId>
++ <version>2.4.3</version>
++ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++ <version>2.3</version>
++ </plugin>
++ </plugins>
++ </pluginManagement>
+ <plugins>
++ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+@@ -153,9 +181,11 @@
+ </configuration>
+ </execution>
+ </executions>
+- </plugin>
++ </plugin>
++ -->
+
+ <!-- Testing the result of the it pom.xml -->
++ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+@@ -166,6 +196,7 @@
+ </excludes>
+ </configuration>
+ </plugin>
++ -->
+ </plugins>
+ </build>
+ <profiles>
Added: trunk/maven-jar-plugin/debian/patches/series
===================================================================
--- trunk/maven-jar-plugin/debian/patches/series (rev 0)
+++ trunk/maven-jar-plugin/debian/patches/series 2008-12-09 22:10:29 UTC (rev 7617)
@@ -0,0 +1 @@
+pom.diff
Modified: trunk/maven-jar-plugin/debian/rules
===================================================================
--- trunk/maven-jar-plugin/debian/rules 2008-12-09 21:37:13 UTC (rev 7616)
+++ trunk/maven-jar-plugin/debian/rules 2008-12-09 22:10:29 UTC (rev 7617)
@@ -6,8 +6,9 @@
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 :=
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+DEB_JARS := maven2 maven-archiver plexus-archiver plexus-utils \
+ commons-lang plexus-container-default-1.0
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