[pkg-java] r14591 - in trunk/wagon/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Mon Aug 29 20:35:14 UTC 2011
Author: twerner
Date: 2011-08-29 20:35:14 +0000 (Mon, 29 Aug 2011)
New Revision: 14591
Added:
trunk/wagon/debian/README.source
trunk/wagon/debian/TODO
trunk/wagon/debian/libwagon-java-doc.doc-base.api
trunk/wagon/debian/libwagon-java-doc.install
trunk/wagon/debian/maven.cleanIgnoreRules
trunk/wagon/debian/maven.properties
trunk/wagon/debian/maven.publishedRules
trunk/wagon/debian/patches/
trunk/wagon/debian/patches/0001-do-not-build-FtpWagonTest.java.patch
trunk/wagon/debian/patches/0002-disable-webdav-jackrabbit-module.patch
trunk/wagon/debian/patches/0003-do-not-run-LightweightHttp-tests.patch
trunk/wagon/debian/patches/series
Removed:
trunk/wagon/debian/build.properties
trunk/wagon/debian/build.xml
trunk/wagon/debian/libwagon-java-doc.doc-base
trunk/wagon/debian/wagon-file-components.xml
trunk/wagon/debian/wagon-ftp-components.xml
trunk/wagon/debian/wagon-http-components.xml
trunk/wagon/debian/wagon-http-lightweight-components.xml
trunk/wagon/debian/wagon-scm-components.xml
trunk/wagon/debian/wagon-ssh-common-components.xml
trunk/wagon/debian/wagon-ssh-components.xml
trunk/wagon/debian/wagon-ssh-external-components.xml
trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml
Modified:
trunk/wagon/debian/changelog
trunk/wagon/debian/control
trunk/wagon/debian/libwagon-java.poms
trunk/wagon/debian/maven.ignoreRules
trunk/wagon/debian/maven.rules
trunk/wagon/debian/rules
Log:
Use Maven to build the package.
Added: trunk/wagon/debian/README.source
===================================================================
--- trunk/wagon/debian/README.source (rev 0)
+++ trunk/wagon/debian/README.source 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,9 @@
+Information about wagon
+------------------------------
+
+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.
Added: trunk/wagon/debian/TODO
===================================================================
--- trunk/wagon/debian/TODO (rev 0)
+++ trunk/wagon/debian/TODO 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1 @@
+- compile and run all tests
Deleted: trunk/wagon/debian/build.properties
===================================================================
--- trunk/wagon/debian/build.properties 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/build.properties 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,14 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
-classpath.compile = \
- ${basedir}/wagon-provider-api/build/wagon-provider-api-${version}.jar:\
- ${basedir}/wagon-providers/wagon-http-shared/build/wagon-http-shared-${version}.jar:\
- ${basedir}/wagon-providers/wagon-ssh-common/build/wagon-ssh-common-${version}.jar:\
- /usr/share/java/jsch.jar:\
- /usr/share/java/maven-scm-api.jar:\
- /usr/share/java/nekohtml.jar:\
- /usr/share/java/xercesImpl.jar:\
- /usr/share/java/plexus-interactivity-api.jar:\
- /usr/share/java/plexus-utils.jar:\
- /usr/share/java/commons-net2.jar: \
- /usr/share/java/commons-httpclient.jar
Deleted: trunk/wagon/debian/build.xml
===================================================================
--- trunk/wagon/debian/build.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/build.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,77 +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}" />
- </ant>
- </sequential>
- </macrodef>
-
- <target name="clean">
- <delete dir="build"/>
- <cleanmodule dir="wagon-provider-api"/>
- <cleanmodule dir="wagon-providers/wagon-file"/>
- <cleanmodule dir="wagon-providers/wagon-ftp"/>
- <cleanmodule dir="wagon-providers/wagon-http-shared"/>
- <cleanmodule dir="wagon-providers/wagon-http-lightweight"/>
- <cleanmodule dir="wagon-providers/wagon-http"/>
- <cleanmodule dir="wagon-providers/wagon-scm"/>
- <cleanmodule dir="wagon-providers/wagon-ssh-common"/>
- <cleanmodule dir="wagon-providers/wagon-ssh-external"/>
- <cleanmodule dir="wagon-providers/wagon-ssh"/>
- <!--cleanmodule dir="wagon-providers/wagon-webdav-jackrabbit"/-->
- </target>
-
- <target name="package">
- <packagemodule dir=""/>
- <packagemodule dir="wagon-provider-api"/>
- <packagemodule dir="wagon-providers/wagon-file"/>
- <packagemodule dir="wagon-providers/wagon-ftp"/>
- <packagemodule dir="wagon-providers/wagon-http-shared"/>
- <packagemodule dir="wagon-providers/wagon-http-lightweight"/>
- <packagemodule dir="wagon-providers/wagon-http"/>
- <packagemodule dir="wagon-providers/wagon-scm"/>
- <packagemodule dir="wagon-providers/wagon-ssh-common"/>
- <packagemodule dir="wagon-providers/wagon-ssh-external"/>
- <packagemodule dir="wagon-providers/wagon-ssh"/>
- <!-- Cannot build as JackRabbit is not in the Debian repository -->
- <!--packagemodule dir="wagon-providers/wagon-webdav-jackrabbit" />
- -->
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="wagon-provider-api/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-file/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-ftp/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-http-lightweight/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-http-shared/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-http/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-scm/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-ssh-common/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-ssh-external/src/main/java/"/>
- <packageset dir="wagon-providers/wagon-ssh/src/main/java/"/>
- <!--packageset dir="wagon-providers/wagon-webdav-jackrabbit/src/main/java/"/-->
- </javadoc>
- </target>
-
-</project>
Modified: trunk/wagon/debian/changelog
===================================================================
--- trunk/wagon/debian/changelog 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/changelog 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,23 +1,20 @@
wagon (1.0.0-1) UNRELEASED; urgency=low
- DOES NOT BUILD YET BECAUSE IT NEEDS JSOUP.
-
[ Michael Koch ]
* Added myself to Uploaders.
* Build-Depends on debhelper (>= 7).
- * Updated Standards-Version to 3.8.3.
[ Torsten Werner ]
* New upstream release 1.0. We use 1.0.0 to fake a newer version compared to
1.0-beta-*.
* Add Build-Depends: libjsoup-java and libcommons-io-java.
* Change debian/watch to allow download of version 1.0.
- * Disable old patch that is not needed anymore.
* Switch to source format 3.0.
* Remove Paul from Uploaders list.
* Update Standards-Version: 3.9.1.
+ * Use Maven to build the package.
- -- Torsten Werner <twerner at debian.org> Mon, 29 Aug 2011 20:47:42 +0200
+ -- Torsten Werner <twerner at debian.org> Mon, 29 Aug 2011 22:28:49 +0200
wagon (1.0-beta-6-2) unstable; urgency=low
Modified: trunk/wagon/debian/control
===================================================================
--- trunk/wagon/debian/control 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/control 2011-08-29 20:35:14 UTC (rev 14591)
@@ -4,32 +4,25 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>,
Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4), ant, ant-optional,
- libxalan2-java,
- junit, junit-doc, openjdk-6-doc,
- libcommons-httpclient-java,
- libcommons-net2-java,
- libjsch-java, libjsch-java-doc,
- libmaven-scm-java, libmaven-scm-java-doc,
- libnekohtml-java, libnekohtml-java-doc,
- libplexus-interactivity-api-java, libplexus-interactivity-api-java-doc,
- libplexus-utils-java, libplexus-utils-java-doc, libjsoup-java,
- libcommons-io-java
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-enforcer-plugin-java, libmaven-javadoc-plugin-java, libplexus-maven-plugin-java,
+ junit (>= 3.8.1), libcommons-codec-java, libcommons-httpclient-java, libcommons-io-java,
+ libcommons-logging-java, libcommons-net2-java, libeasymock-java, libjetty-java,
+ libjsch-java, libjsoup-java, libmaven-scm-java, libplexus-container-default-java,
+ libplexus-containers-java, libplexus-interactivity-api-java, libplexus-utils-java,
+ junit (>= 3.8.1), libeasymock-java, libjetty-java, libmaven-scm-java, default-jdk-doc,
+ libcommons-codec-java-doc, libcommons-logging-java-doc, libcommons-net2-java-doc,
+ libjetty-java-doc, libmaven-scm-java-doc, libplexus-container-default-java-doc,
+ libplexus-containers-java-doc, libplexus-interactivity-api-java-doc, libplexus-utils-java-doc
Standards-Version: 3.9.1
-Homepage: http://maven.apache.org/wagon/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/wagon/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/wagon
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/wagon/
+Homepage: http://maven.apache.org/wagon/
Package: libwagon-java
Architecture: all
-Depends: ${misc:Depends}, libcommons-httpclient-java,
- libcommons-net2-java,
- libjsch-java,
- libmaven-scm-java,
- libnekohtml-java,
- libplexus-interactivity-api-java,
- libplexus-utils-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
Suggests: libwagon-java-doc
Homepage: http://maven.apache.org/wagon/
Description: tools to manage Maven artifacts and deployment
@@ -78,12 +71,8 @@
Package: libwagon-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc,
- libmaven-scm-java-doc,
- libnekohtml-java-doc,
- libplexus-utils-java-doc,
- libplexus-interactivity-api-java-doc,
- libjsch-java-doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
Suggests: libwagon-java
Homepage: http://maven.apache.org/wagon/
Description: tools to manage Maven artifacts and deployment
Deleted: trunk/wagon/debian/libwagon-java-doc.doc-base
===================================================================
--- trunk/wagon/debian/libwagon-java-doc.doc-base 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/libwagon-java-doc.doc-base 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,9 +0,0 @@
-Document: libwagon-java
-Title: API Javadoc for Wagon
-Author: Wagon developers
-Abstract: This is the API Javadoc provided by the Wagon library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libwagon-java/api/index.html
-Files: /usr/share/doc/libwagon-java/api/*
Copied: trunk/wagon/debian/libwagon-java-doc.doc-base.api (from rev 14587, trunk/wagon/debian/libwagon-java-doc.doc-base)
===================================================================
--- trunk/wagon/debian/libwagon-java-doc.doc-base.api (rev 0)
+++ trunk/wagon/debian/libwagon-java-doc.doc-base.api 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,10 @@
+Document: libwagon-java
+Title: API Javadoc for Maven Wagon
+Author: Maven Wagon developers
+Abstract: This is the API Javadoc provided for the
+ libwagon-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libwagon-java/api/index.html
+Files: /usr/share/doc/libwagon-java/api/*
Added: trunk/wagon/debian/libwagon-java-doc.install
===================================================================
--- trunk/wagon/debian/libwagon-java-doc.install (rev 0)
+++ trunk/wagon/debian/libwagon-java-doc.install 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,2 @@
+target/site/apidocs/* usr/share/doc/libwagon-java/api
+
Modified: trunk/wagon/debian/libwagon-java.poms
===================================================================
--- trunk/wagon/debian/libwagon-java.poms 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/libwagon-java.poms 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,14 +1,41 @@
-pom.xml --no-parent
-wagon-provider-api/pom.xml
-wagon-providers/pom.xml
-wagon-providers/wagon-file/pom.xml
-wagon-providers/wagon-ftp/pom.xml
-wagon-providers/wagon-http-lightweight/pom.xml
-wagon-providers/wagon-http-shared/pom.xml
-wagon-providers/wagon-http/pom.xml
-wagon-providers/wagon-scm/pom.xml
-wagon-providers/wagon-ssh-common/pom.xml
-wagon-providers/wagon-ssh-external/pom.xml
-wagon-providers/wagon-ssh/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
+wagon-provider-api/pom.xml --has-package-version
+wagon-providers/pom.xml --has-package-version
+wagon-providers/wagon-file/pom.xml --has-package-version
+wagon-providers/wagon-ftp/pom.xml --has-package-version
+wagon-providers/wagon-http-lightweight/pom.xml --has-package-version
+wagon-providers/wagon-http/pom.xml --has-package-version
+wagon-providers/wagon-http-shared/pom.xml --has-package-version
+wagon-providers/wagon-scm/pom.xml --has-package-version
+wagon-providers/wagon-ssh-external/pom.xml --has-package-version
+wagon-providers/wagon-ssh-common/pom.xml --has-package-version
+wagon-providers/wagon-ssh-common-test/pom.xml --has-package-version
+wagon-providers/wagon-ssh/pom.xml --has-package-version
+wagon-provider-test/pom.xml --has-package-version
+wagon-tcks/pom.xml --has-package-version
+wagon-tcks/wagon-tck-http/pom.xml --has-package-version
Added: trunk/wagon/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/wagon/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/wagon/debian/maven.cleanIgnoreRules 2011-08-29 20:35:14 UTC (rev 14591)
@@ -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/
+
Modified: trunk/wagon/debian/maven.ignoreRules
===================================================================
--- trunk/wagon/debian/maven.ignoreRules 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/maven.ignoreRules 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,3 +1,17 @@
-junit junit
-org.apache.maven.wagon wagon-provider-test
+# 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.codehaus.plexus plexus-ftpd * * * *
Added: trunk/wagon/debian/maven.properties
===================================================================
--- trunk/wagon/debian/maven.properties (rev 0)
+++ trunk/wagon/debian/maven.properties 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/wagon/debian/maven.publishedRules
===================================================================
--- trunk/wagon/debian/maven.publishedRules (rev 0)
+++ trunk/wagon/debian/maven.publishedRules 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,19 @@
+# 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/
+
Modified: trunk/wagon/debian/maven.rules
===================================================================
--- trunk/wagon/debian/maven.rules 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/maven.rules 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,4 +1,43 @@
-commons-httpclient commons-httpclient jar s/3\..*/3.x/
-commons-net commons-net jar s/2\..+/2.x/
-junit junit jar s/3\..*/3.x/
-org.mortbay.jetty * * s/6..*/6.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/
+
+commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
+commons-net commons-net jar s/2\..+/2.x/ * *
+junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.apache.maven.wagon wagon-file jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ftp jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-http-lightweight jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-http-shared jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-http jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-provider-api jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-provider-test jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-providers pom s/.*/debian/ * *
+org.apache.maven.wagon wagon-scm jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh-common-test jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh-common jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh-external jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-tck-http jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-tcks pom s/.*/debian/ * *
+org.apache.maven.wagon wagon pom s/.*/debian/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.jsoup jsoup jar s/.*/debian/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+s/easymock/org.easymock/ easymock * s/.*/debian/ * *
+org.mortbay.jetty * * s/6\..*/6.x/ * *
Added: trunk/wagon/debian/patches/0001-do-not-build-FtpWagonTest.java.patch
===================================================================
--- trunk/wagon/debian/patches/0001-do-not-build-FtpWagonTest.java.patch (rev 0)
+++ trunk/wagon/debian/patches/0001-do-not-build-FtpWagonTest.java.patch 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,29 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Mon, 29 Aug 2011 21:16:24 +0200
+Subject: [PATCH] do not build FtpWagonTest.java
+
+---
+ wagon-providers/wagon-ftp/pom.xml | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml
+index ddd0dc0..92c3f79 100644
+--- a/wagon-providers/wagon-ftp/pom.xml
++++ b/wagon-providers/wagon-ftp/pom.xml
+@@ -73,6 +73,15 @@ under the License.
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <testExcludes>
++ <exclude>**/FtpWagonTest.java</exclude>
++ </testExcludes>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+ </project>
+--
Added: trunk/wagon/debian/patches/0002-disable-webdav-jackrabbit-module.patch
===================================================================
--- trunk/wagon/debian/patches/0002-disable-webdav-jackrabbit-module.patch (rev 0)
+++ trunk/wagon/debian/patches/0002-disable-webdav-jackrabbit-module.patch 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,21 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Mon, 29 Aug 2011 21:50:00 +0200
+Subject: [PATCH] disable webdav-jackrabbit module
+
+---
+ wagon-providers/pom.xml | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
+index c0bf971..42eebe5 100644
+--- a/wagon-providers/pom.xml
++++ b/wagon-providers/pom.xml
+@@ -42,7 +42,6 @@ under the License.
+ <module>wagon-ssh-common</module>
+ <module>wagon-ssh-common-test</module>
+ <module>wagon-ssh</module>
+- <module>wagon-webdav-jackrabbit</module>
+ </modules>
+
+ <dependencies>
+--
Added: trunk/wagon/debian/patches/0003-do-not-run-LightweightHttp-tests.patch
===================================================================
--- trunk/wagon/debian/patches/0003-do-not-run-LightweightHttp-tests.patch (rev 0)
+++ trunk/wagon/debian/patches/0003-do-not-run-LightweightHttp-tests.patch 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,32 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Mon, 29 Aug 2011 21:39:30 +0200
+Subject: [PATCH] do not run LightweightHttp* tests
+
+---
+ wagon-providers/wagon-http-lightweight/pom.xml | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml
+index 70ea885..d413f31 100644
+--- a/wagon-providers/wagon-http-lightweight/pom.xml
++++ b/wagon-providers/wagon-http-lightweight/pom.xml
+@@ -50,4 +50,18 @@ under the License.
+ </exclusions>
+ </dependency>
+ </dependencies>
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-surefire-plugin</artifactId>
++ <configuration>
++ <excludes>
++ <exclude>**/LightweightHttp*</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ </project>
+--
Added: trunk/wagon/debian/patches/series
===================================================================
--- trunk/wagon/debian/patches/series (rev 0)
+++ trunk/wagon/debian/patches/series 2011-08-29 20:35:14 UTC (rev 14591)
@@ -0,0 +1,3 @@
+0001-do-not-build-FtpWagonTest.java.patch
+0002-disable-webdav-jackrabbit-module.patch
+0003-do-not-run-LightweightHttp-tests.patch
Modified: trunk/wagon/debian/rules
===================================================================
--- trunk/wagon/debian/rules 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/rules 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,50 +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 := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/^1\.0\.0/1.0/')
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps jsoup commons-io
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS := build/api
-MODULES := wagon-file wagon-ftp wagon-http wagon-http-lightweight wagon-http-shared \
- wagon-scm wagon-ssh wagon-ssh-common wagon-ssh-external
- #wagon-webdav-jackrabbit
+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
-
-makebuilddir/lib$(PACKAGE)-java::
- set -e; for MODULE in $(addprefix wagon-providers/, $(MODULES)); do \
- COMPONENT_FILE=debian/$$(echo $$MODULE | cut -d'/' -f2 -)-components.xml; \
- if [ -e $$COMPONENT_FILE ]; then \
- install -d $$MODULE/build/classes/META-INF/plexus; \
- install -m644 -T $$COMPONENT_FILE $$MODULE/build/classes/META-INF/plexus/components.xml; \
- fi \
- done
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l wagon-provider-api/pom.xml wagon-provider-api/build/wagon-provider-api-$(VERSION).jar
- set -e; for MODULE in $(MODULES); do \
- mh_installjar -plib$(PACKAGE)-java -l wagon-providers/$$MODULE/pom.xml wagon-providers/$$MODULE/build/$$MODULE-$(VERSION).jar; \
- done
-
-binary-post-install/lib$(PACKAGE)-java-doc::
- dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
-
-clean::
- -rm -rf debian/tmp
-
-# Extract generated plexus components.xml files from a standard Maven build
-PLEXUS_COMPONENTS=$(shell find . -name components.xml | grep target | sed -re "s,.*/([a-z-]+)/target/.*,debian/\1-components.xml,")
-
-debian/%-components.xml:
- echo $*
- find . -type f -path *$*/target/classes/META-INF/plexus/components.xml -exec cp '{}' $@ \;
-
-copy-plexus-components: $(PLEXUS_COMPONENTS)
Deleted: trunk/wagon/debian/wagon-file-components.xml
===================================================================
--- trunk/wagon/debian/wagon-file-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-file-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,11 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>file</role-hint>
- <implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>Wagon Provider for Local File System</description>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-ftp-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ftp-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-ftp-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,14 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>ftp</role-hint>
- <implementation>org.apache.maven.wagon.providers.ftp.FtpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>FtpWagon</description>
- <configuration>
- <passive-mode>true</passive-mode>
- </configuration>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-http-components.xml
===================================================================
--- trunk/wagon/debian/wagon-http-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-http-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,35 +0,0 @@
-<!--
- ~ 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.
- -->
-
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>http</role-hint>
- <implementation>org.apache.maven.wagon.providers.http.HttpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>https</role-hint>
- <implementation>org.apache.maven.wagon.providers.http.HttpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-http-lightweight-components.xml
===================================================================
--- trunk/wagon/debian/wagon-http-lightweight-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-http-lightweight-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,18 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>http</role-hint>
- <implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>LightweightHttpWagon</description>
- </component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>https</role-hint>
- <implementation>org.apache.maven.wagon.providers.http.LightweightHttpsWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>LIghtweightHttpsWagon</description>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-scm-components.xml
===================================================================
--- trunk/wagon/debian/wagon-scm-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-scm-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,15 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>scm</role-hint>
- <implementation>org.apache.maven.wagon.providers.scm.ScmWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <requirements>
- <requirement>
- <role>org.apache.maven.scm.manager.ScmManager</role>
- </requirement>
- </requirements>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-ssh-common-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ssh-common-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-ssh-common-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,47 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
- <implementation>org.apache.maven.wagon.providers.ssh.interactive.ConsoleInteractiveUserInfo</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>Shows messages to System.</description>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.components.interactivity.Prompter</role>
- <role-hint>default</role-hint>
- <field-name>prompter</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
- <role-hint>file</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.knownhost.FileKnownHostsProvider</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>Provides known hosts from a file</description>
- <configuration>
- <host-key-checking>ask</host-key-checking>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
- <role-hint>single</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.knownhost.SingleKnownHostProvider</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>Simple <code>KnownHostsProvider</code> with known wired values</description>
- <configuration>
- <host-key-checking>ask</host-key-checking>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
- <role-hint>null</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.knownhost.NullKnownHostProvider</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>Dummy <code>KnownHostsProvider</code></description>
- <configuration>
- <host-key-checking>ask</host-key-checking>
- </configuration>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-ssh-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ssh-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-ssh-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,82 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>com.jcraft.jsch.UIKeyboardInteractive</role>
- <implementation>org.apache.maven.wagon.providers.ssh.jsch.interactive.PrompterUIKeyboardInteractive</implementation>
- <description>UIKeyboardInteractive that use plexus-prompter.</description>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.components.interactivity.Prompter</role>
- <role-hint>default</role-hint>
- <field-name>prompter</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.wagon.CommandExecutor</role>
- <role-hint>scp</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.jsch.ScpCommandExecutor</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>ScpCommandExecutor - bridge class for plexus:descriptor</description>
- <requirements>
- <requirement>
- <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
- <role-hint>file</role-hint>
- <field-name>knownHostsProvider</field-name>
- </requirement>
- <requirement>
- <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
- <field-name>interactiveUserInfo</field-name>
- </requirement>
- <requirement>
- <role>com.jcraft.jsch.UIKeyboardInteractive</role>
- <field-name>uIKeyboardInteractive</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>sftp</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.jsch.SftpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>SFTP protocol wagon.</description>
- <requirements>
- <requirement>
- <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
- <role-hint>file</role-hint>
- <field-name>knownHostsProvider</field-name>
- </requirement>
- <requirement>
- <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
- <field-name>interactiveUserInfo</field-name>
- </requirement>
- <requirement>
- <role>com.jcraft.jsch.UIKeyboardInteractive</role>
- <field-name>uIKeyboardInteractive</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>scp</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.jsch.ScpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>SCP protocol wagon.</description>
- <requirements>
- <requirement>
- <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
- <role-hint>file</role-hint>
- <field-name>knownHostsProvider</field-name>
- </requirement>
- <requirement>
- <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
- <field-name>interactiveUserInfo</field-name>
- </requirement>
- <requirement>
- <role>com.jcraft.jsch.UIKeyboardInteractive</role>
- <field-name>uIKeyboardInteractive</field-name>
- </requirement>
- </requirements>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-ssh-external-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ssh-external-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-ssh-external-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,18 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.CommandExecutor</role>
- <role-hint>scpexe</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.external.ScpExternalCommandExecutor</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>ScpExternalCommandExecutor - bridge class for plexus:descriptor</description>
- </component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>scpexe</role-hint>
- <implementation>org.apache.maven.wagon.providers.ssh.external.ScpExternalWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>SCP deployer using "external" scp program.</description>
- </component>
- </components>
-</component-set>
Deleted: trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml
===================================================================
--- trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml 2011-08-29 18:52:55 UTC (rev 14590)
+++ trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml 2011-08-29 20:35:14 UTC (rev 14591)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>dav</role-hint>
- <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description><p>WebDavWagon</p>
-<p/>
-<p>Allows using a webdav remote repository for downloads and deployments</p></description>
- <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm><instantiation-strategy>per-lookup</instantiation-strategy><instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>davs</role-hint>
- <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description><p>WebDavWagon</p>
-<p/>
-<p>Allows using a webdav remote repository for downloads and deployments</p></description>
- <isolated-realm>false</isolated-realm>
- <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component><component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>dav+http</role-hint>
- <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description><p>WebDavWagon</p>
-<p/>
-<p>Allows using a webdav remote repository for downloads and deployments</p></description>
- <isolated-realm>false</isolated-realm>
- <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component><component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>dav+https</role-hint>
- <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description><p>WebDavWagon</p>
-<p/>
-<p>Allows using a webdav remote repository for downloads and deployments</p></description>
- <isolated-realm>false</isolated-realm>
- <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component></components>
-</component-set>
More information about the pkg-java-commits
mailing list