This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-plugin-testing-1.3.
commit b258e31928ae5ecf1c3c76d8aea7109034633120 Author: Torsten Werner <[email protected]> Date: Tue Aug 23 21:16:13 2011 +0000 * Use Maven for building the package but ignore test failures. * Add a documentation package. --- debian/README.source | 9 +++ debian/TODO | 1 + debian/build.properties | 26 ------- debian/build.xml | 89 ---------------------- debian/changelog | 4 +- debian/control | 45 ++++++++--- debian/copyright | 3 +- .../libmaven-plugin-testing-java-doc.doc-base.api | 10 +++ debian/libmaven-plugin-testing-java-doc.install | 2 + debian/libmaven-plugin-testing-java.poms | 33 +++++++- debian/maven-settings.xml | 9 --- debian/maven.cleanIgnoreRules | 17 +++++ debian/maven.ignoreRules | 17 +++++ debian/maven.properties | 5 ++ debian/maven.publishedRules | 19 +++++ debian/maven.rules | 28 ++++++- debian/orig-tar.sh | 14 ++-- debian/patches/0001-fix-for-maven-2.1.0.patch | 24 ++++++ .../0002-fix-dependency-on-maven-test-tools.patch | 25 ++++++ debian/patches/maven2.1.0.patch | 13 ---- debian/patches/series | 3 +- debian/rules | 28 +------ debian/watch | 4 +- 23 files changed, 238 insertions(+), 190 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e02ddbb --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Information about maven-plugin-testing +------------------------------ + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..42062de --- /dev/null +++ b/debian/TODO @@ -0,0 +1 @@ +- fix test failure(s) diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 0b38730..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,26 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true -classpath.compile = \ - /usr/share/java/junit.jar:\ - /usr/share/java/easymock.jar:\ - /usr/share/java/maven-artifact.jar:\ - /usr/share/java/maven-artifact-manager.jar:\ - /usr/share/java/maven-core.jar:\ - /usr/share/java/maven-model.jar:\ - /usr/share/java/maven-project.jar:\ - /usr/share/java/maven-plugin-api.jar:\ - /usr/share/java/maven-plugin-descriptor.jar:\ - /usr/share/java/maven-plugin-registry.jar:\ - /usr/share/java/maven-settings.jar:\ - /usr/share/java/maven-invoker.jar:\ - /usr/share/java/maven-toolchain.jar:\ - /usr/share/java/wagon-provider-api.jar:\ - /usr/share/java/plexus-archiver.jar:\ - /usr/share/java/plexus-classworlds.jar:\ - /usr/share/java/plexus-utils.jar:\ - /usr/share/java/plexus-container-default-alpha.jar:\ - ${basedir}/maven-plugin-testing-harness/target/maven-plugin-testing-harness-${version}.jar:\ - ${basedir}/maven-plugin-testing-tools/target/maven-plugin-testing-tools-${version}.jar:\ - ${basedir}/maven-test-tools/target/maven-test-tools-${version}.jar - diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 6514389..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> - -<project name="pkg-java" default="package" basedir=".."> - - <property file="debian/build.properties"/> - <property name="maven.build" 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}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="packagemodule"> - <attribute name="dir"/> - <sequential> - <ant target="package" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - <property name="keep-cleaned-pom" value="true" /> - <property name="use-local-repo" value="true" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="package-plexus-module"> - <attribute name="dir"/> - <sequential> - <ant target="package" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - <property name="maven.generate.target" value="org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata" /> - <property name="keep-cleaned-pom" value="true" /> - <property name="use-local-repo" value="true" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="restore-pom"> - <attribute name="dir"/> - <sequential> - <ant target="restore-pom" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - </ant> - </sequential> - </macrodef> - - <target name="clean"> - <cleanmodule dir=""/> - <cleanmodule dir="maven-plugin-testing-harness"/> - <cleanmodule dir="maven-test-tools"/> - <cleanmodule dir="maven-plugin-testing-tools"/> - </target> - - <target name="package"> - <packagemodule dir=""/> - <packagemodule dir="maven-plugin-testing-harness"/> - <packagemodule dir="maven-test-tools"/> - <!--mkdir dir="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian" /> - <copy file="surefire-api/target/surefire-api-${version}.jar" - tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.jar" /> - <copy file="debian/tmp/pom.xml" - tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.pom" /> - <copy file="surefire-booter/target/surefire-booter-${version}.jar" - tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.jar" /> - <copy file="debian/tmp/pom.xml" - tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.pom" /--> - <package-plexus-module dir="maven-plugin-testing-tools"/> - <restore-pom dir=""/> - <restore-pom dir="maven-plugin-testing-harness"/> - <restore-pom dir="maven-plugin-testing-tools"/> - <restore-pom dir="maven-test-tools"/> - </target> - - <target name="javadoc"> - <javadoc destdir="${javadoc.dir}"> - <packageset dir="maven-plugin-testing-harness/src/main/java/"/> - <packageset dir="maven-plugin-testing-tools/src/main/java/"/> - <packageset dir="maven-test-tools/src/main/java/"/> - </javadoc> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index ced6c22..73bbf74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ maven-plugin-testing (1.2-3) unstable; urgency=low * Switch to source format 3.0. * Switch to debhelper level 7. * Update Standards-Version: 3.9.1. + * Use Maven for building the package but ignore test failures. + * Add a documentation package. - -- Torsten Werner <[email protected]> Tue, 23 Aug 2011 22:21:18 +0200 + -- Torsten Werner <[email protected]> Tue, 23 Aug 2011 22:42:02 +0200 maven-plugin-testing (1.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index de90a71..a43884c 100644 --- a/debian/control +++ b/debian/control @@ -3,20 +3,21 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Ludovic Claude <[email protected]> -Build-Depends: ant, debhelper (>= 7), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant-optional, - junit, libmaven-plugin-tools-java, libplexus-component-metadata-java (>= 1.0~beta3.0.7), - libmaven2-core-java, libmaven-invoker-java, libplexus-archiver-java, - libplexus-utils-java, libplexus-container-default-java, libeasymock-java +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libplexus-maven-plugin-java, junit, libeasymock-java, libmaven-invoker-java, + libmaven2-core-java, libplexus-archiver-java, libplexus-container-default-java, + libplexus-utils-java, default-jdk-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc, + libplexus-utils-java-doc, libmaven-javadoc-plugin-java Standards-Version: 3.9.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-plugin-tools -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-plugin-tools/ -Homepage: http://maven.apache.org +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-plugin-testing +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-plugin-testing +Homepage: http://maven.apache.org/plugin-testing/ Package: libmaven-plugin-testing-java Architecture: all -Depends: ${misc:Depends}, libmaven2-core-java, libmaven-invoker-java, libplexus-archiver-java, - libplexus-utils-java, libplexus-container-default-java, libeasymock-java +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libmaven-plugin-testing-java-doc Description: Maven Plugin Testing 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, @@ -34,3 +35,27 @@ Description: Maven Plugin Testing * Allowing transparent migration to new features . This package ships the necessary modules to be able to test Maven Plugins. + +Package: libmaven-plugin-testing-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libmaven-plugin-testing-java +Description: Documentation for Maven Plugin Testing + 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 libmaven-plugin-testing-java. diff --git a/debian/copyright b/debian/copyright index 9ad7732..a821b23 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,11 +9,12 @@ License: Apache-2.0 Files: debian/* Copyright: 2009, Ludovic Claude <[email protected]> + 2011, Torsten Werner <[email protected]> License: GPL-3+ License: Apache-2.0 On Debian GNU/Linux system you can find the complete text of the - Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'. + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'. License: GPL-3 On Debian GNU/Linux system you can find the complete text of the diff --git a/debian/libmaven-plugin-testing-java-doc.doc-base.api b/debian/libmaven-plugin-testing-java-doc.doc-base.api new file mode 100644 index 0000000..2fc1da4 --- /dev/null +++ b/debian/libmaven-plugin-testing-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libmaven-plugin-testing-java +Title: API Javadoc for Maven Plugin Testing +Author: Maven Plugin Testing developers +Abstract: This is the API Javadoc provided for the + libmaven-plugin-testing-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmaven-plugin-testing-java/api/index.html +Files: /usr/share/doc/libmaven-plugin-testing-java/api/* diff --git a/debian/libmaven-plugin-testing-java-doc.install b/debian/libmaven-plugin-testing-java-doc.install new file mode 100644 index 0000000..b8e9878 --- /dev/null +++ b/debian/libmaven-plugin-testing-java-doc.install @@ -0,0 +1,2 @@ +target/site/apidocs/* usr/share/doc/libmaven-plugin-testing-java/api + diff --git a/debian/libmaven-plugin-testing-java.poms b/debian/libmaven-plugin-testing-java.poms index 6f2cfb3..93d4502 100644 --- a/debian/libmaven-plugin-testing-java.poms +++ b/debian/libmaven-plugin-testing-java.poms @@ -1,4 +1,29 @@ -pom.xml --no-parent -maven-plugin-testing-harness/pom.xml -maven-plugin-testing-tools/pom.xml -maven-test-tools/pom.xml +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar +# it will be installed with mh_install. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml --no-parent --has-package-version +maven-plugin-testing-harness/pom.xml --has-package-version +maven-plugin-testing-tools/pom.xml --has-package-version +maven-test-tools/pom.xml --has-package-version diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml deleted file mode 100644 index 01f8769..0000000 --- a/debian/maven-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!-- - This is a minimal settings.xml that switches maven to offline mode - and uses the Debian repo as the local repo. ---> - -<settings> - <localRepository>/usr/share/maven-repo</localRepository> - <offline>true</offline> -</settings> diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..c521bf6 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,17 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +org.apache.maven.plugins maven-source-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..16360f6 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.failure.ignore=true diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules index 8d8d421..00e0f4a 100644 --- a/debian/maven.publishedRules +++ b/debian/maven.publishedRules @@ -1,3 +1,22 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools diff --git a/debian/maven.rules b/debian/maven.rules index b9d859c..46d4c54 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,3 +1,25 @@ -org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ -junit junit jar s/3\..*/3.x/ -asm asm jar s/3\..*/3.x/ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + +junit junit jar s/3\..*/3.x/ * * +org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * +s/easymock/org.easymock/ easymock * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 75a2e2b..f57ceb2 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,16 +1,16 @@ #!/bin/sh -e -TAR=../maven-plugin-testing_$2.orig.tar.gz -DIR=maven-plugin-testing-$2 -TAG=$(echo maven-plugin-testing-$2 | sed 's/~\(alpha\|beta\)/-\1-/') +VERSION=$2 +TAR=../maven-plugin-testing_$VERSION.orig.tar.gz +DIR=maven-plugin-testing-$VERSION +TAG=$(echo "maven-plugin-testing-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') -svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/${TAG}/ $DIR +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $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" + mv $TAR $origDir && echo "moved $TAR to $origDir" fi diff --git a/debian/patches/0001-fix-for-maven-2.1.0.patch b/debian/patches/0001-fix-for-maven-2.1.0.patch new file mode 100644 index 0000000..00236dc --- /dev/null +++ b/debian/patches/0001-fix-for-maven-2.1.0.patch @@ -0,0 +1,24 @@ +From: Debian Java Maintainers <[email protected]> +Date: Tue, 23 Aug 2011 22:56:20 +0200 +Subject: [PATCH] fix for maven 2.1.0 + +--- + .../maven/plugin/testing/stubs/ArtifactStub.java | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java +index 6d1ae4c..aa97221 100644 +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java +@@ -461,6 +461,10 @@ public class ArtifactStub + return false; + } + ++ public ArtifactMetadata getMetadata( Class metadataClass ) { ++ return null; ++ } ++ + /** + * @see java.lang.Object#toString() + */ +-- diff --git a/debian/patches/0002-fix-dependency-on-maven-test-tools.patch b/debian/patches/0002-fix-dependency-on-maven-test-tools.patch new file mode 100644 index 0000000..e2ba661 --- /dev/null +++ b/debian/patches/0002-fix-dependency-on-maven-test-tools.patch @@ -0,0 +1,25 @@ +From: Torsten Werner <[email protected]> +Date: Tue, 23 Aug 2011 22:58:07 +0200 +Subject: [PATCH] fix dependency on maven-test-tools + +--- + maven-plugin-testing-tools/pom.xml | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/maven-plugin-testing-tools/pom.xml b/maven-plugin-testing-tools/pom.xml +index 8a59f6a..5be196a 100644 +--- a/maven-plugin-testing-tools/pom.xml ++++ b/maven-plugin-testing-tools/pom.xml +@@ -66,9 +66,9 @@ + <version>2.0.7</version> + </dependency> + <dependency> +- <groupId>org.apache.maven.shared</groupId> ++ <groupId>org.apache.maven.plugin-testing</groupId> + <artifactId>maven-test-tools</artifactId> +- <version>1.0-alpha-2</version> ++ <version>1.2</version> + <scope>test</scope> + </dependency> + </dependencies> +-- diff --git a/debian/patches/maven2.1.0.patch b/debian/patches/maven2.1.0.patch deleted file mode 100644 index 2e8c597..0000000 --- a/debian/patches/maven2.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java -+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java -@@ -461,6 +461,10 @@ - return false; - } - -+ public ArtifactMetadata getMetadata( Class metadataClass ) { -+ return null; -+ } -+ - /** - * @see java.lang.Object#toString() - */ diff --git a/debian/patches/series b/debian/patches/series index 32b7d2c..8ed8156 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -maven2.1.0.patch +0001-fix-for-maven-2.1.0.patch +0002-fix-dependency-on-maven-test-tools.patch diff --git a/debian/rules b/debian/rules index 7e12366..562f1f3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,10 @@ #!/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/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -# Need to specify the exact version of the Plexus plugin (from plexus-component-metadata package) used here -PLEXUS_PLUGIN_VERSION:= 1.0-beta-3.0.7 -DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api maven-plugin-descriptor maven-plugin-registry \ - maven-project maven-artifact maven-artifact-manager maven-settings maven-invoker \ - plexus-utils plexus-archiver plexus-container-default-alpha easymock -DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dplexus-component-metadata.version=$(PLEXUS_PLUGIN_VERSION) -API_DOCS := target/api +JAVA_HOME := /usr/lib/jvm/default-java +DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l maven-plugin-testing-harness/pom.xml maven-plugin-testing-harness/target/maven-plugin-testing-harness-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l maven-plugin-testing-tools/pom.xml maven-plugin-testing-tools/target/maven-plugin-testing-tools-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l maven-test-tools/pom.xml maven-test-tools/target/maven-test-tools-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff --git a/debian/watch b/debian/watch index 9165fd9..594efdf 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=uversionmangle=s/-(alpha|beta)-/~$1/ \ +opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ http://svn.apache.org/repos/asf/maven/plugin-testing/tags/ \ - maven-plugin-testing-(.*)/ debian debian/orig-tar.sh + maven-plugin-testing-(\d.*)/ debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-testing-1.3.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
