Author: twerner Date: 2011-09-11 15:33:49 +0000 (Sun, 11 Sep 2011) New Revision: 14820
Added: trunk/libcommons-dbcp-java/debian/TODO trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base.api trunk/libcommons-dbcp-java/debian/maven.cleanIgnoreRules trunk/libcommons-dbcp-java/debian/maven.ignoreRules trunk/libcommons-dbcp-java/debian/maven.properties trunk/libcommons-dbcp-java/debian/maven.publishedRules trunk/libcommons-dbcp-java/debian/patches/0001-configure-source-and-target-version-1.5.patch Removed: trunk/libcommons-dbcp-java/debian/ant.properties trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base trunk/libcommons-dbcp-java/debian/patches/01_build.patch Modified: trunk/libcommons-dbcp-java/debian/README.source trunk/libcommons-dbcp-java/debian/changelog trunk/libcommons-dbcp-java/debian/control trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms trunk/libcommons-dbcp-java/debian/maven.rules trunk/libcommons-dbcp-java/debian/patches/series trunk/libcommons-dbcp-java/debian/rules Log: Use Maven to build the package. Modified: trunk/libcommons-dbcp-java/debian/README.source =================================================================== --- trunk/libcommons-dbcp-java/debian/README.source 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/README.source 2011-09-11 15:33:49 UTC (rev 14820) @@ -1,6 +1,9 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. +Information about libcommons-dbcp-java +------------------------------ -See /usr/share/doc/quilt/README.source for a detailed explanation. +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/libcommons-dbcp-java/debian/TODO =================================================================== --- trunk/libcommons-dbcp-java/debian/TODO (rev 0) +++ trunk/libcommons-dbcp-java/debian/TODO 2011-09-11 15:33:49 UTC (rev 14820) @@ -0,0 +1 @@ +- build and run tests Deleted: trunk/libcommons-dbcp-java/debian/ant.properties =================================================================== --- trunk/libcommons-dbcp-java/debian/ant.properties 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/ant.properties 2011-09-11 15:33:49 UTC (rev 14820) @@ -1,2 +0,0 @@ -commons-collections.jar=/usr/share/java/commons-collections3.jar -commons-pool.jar=/usr/share/java/commons-pool.jar Modified: trunk/libcommons-dbcp-java/debian/changelog =================================================================== --- trunk/libcommons-dbcp-java/debian/changelog 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/changelog 2011-09-11 15:33:49 UTC (rev 14820) @@ -1,12 +1,12 @@ libcommons-dbcp-java (1.4-2) unstable; urgency=low - UNRELEASED (should switch to Maven, needs pom of geronimo jta, see #581663) * Team upload. * Switch to source format 3.0. * Remove Java runtime from Depends. * Update Standards-Version: 3.9.1. + * Use Maven to build the package. - -- Torsten Werner <[email protected]> Sat, 03 Sep 2011 12:51:16 +0200 + -- Torsten Werner <[email protected]> Sun, 11 Sep 2011 17:15:36 +0200 libcommons-dbcp-java (1.4-1) unstable; urgency=low Modified: trunk/libcommons-dbcp-java/debian/control =================================================================== --- trunk/libcommons-dbcp-java/debian/control 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/control 2011-09-11 15:33:49 UTC (rev 14820) @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Michael Koch <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant -Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit, - glassfish-javaee, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-javadoc-plugin-java, libcommons-pool-java, + default-jdk-doc, libcommons-pool-java-doc, libgeronimo-jta-1.1-spec-java Standards-Version: 3.9.1 Homepage: http://commons.apache.org/dbcp/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/ @@ -13,8 +13,9 @@ Package: libcommons-dbcp-java Architecture: all -Depends: ${misc:Depends}, libcommons-pool-java, libcommons-collections3-java -Suggests: glassfish-javaee +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libcommons-dbcp-java-doc Description: Database Connection Pooling Services The DBCP package provides database connection pooling services. The following features are supported @@ -32,8 +33,8 @@ Package: libcommons-dbcp-java-doc Architecture: all Section: doc -Depends: ${misc:Depends} -Recommends: libcommons-pool-java-doc, default-jdk-doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} Suggests: libcommons-dbcp-java Description: Database Connection Pooling Services - documentation The DBCP package provides database connection pooling services. The Deleted: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base =================================================================== --- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base 2011-09-11 15:33:49 UTC (rev 14820) @@ -1,10 +0,0 @@ -Document: libcommons-dbcp-java -Title: API Javadoc for libcommons-dbcp-java -Author: libcommons-dbcp-java developers -Abstract: This is the API Javadoc provided by the libcommons-dbcp-java library. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcommons-dbcp-java/api/index.html -Files: /usr/share/doc/libcommons-dbcp-java/api/* - Copied: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base.api (from rev 14819, trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base) =================================================================== --- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base.api (rev 0) +++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base.api 2011-09-11 15:33:49 UTC (rev 14820) @@ -0,0 +1,10 @@ +Document: libcommons-dbcp-java +Title: API Javadoc for Commons DBCP +Author: Commons DBCP developers +Abstract: This is the API Javadoc provided for the + libcommons-dbcp-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-dbcp-java/api/index.html +Files: /usr/share/doc/libcommons-dbcp-java/api/* Modified: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install =================================================================== --- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install 2011-09-11 15:33:49 UTC (rev 14820) @@ -1 +1,2 @@ -dist/docs/* /usr/share/doc/libcommons-dbcp-java +target/apidocs/* usr/share/doc/libcommons-dbcp-java/api + Modified: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms =================================================================== --- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms 2011-09-11 15:33:49 UTC (rev 14820) @@ -1 +1,26 @@ -pom.xml --no-parent +# 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 Added: trunk/libcommons-dbcp-java/debian/maven.cleanIgnoreRules =================================================================== --- trunk/libcommons-dbcp-java/debian/maven.cleanIgnoreRules (rev 0) +++ trunk/libcommons-dbcp-java/debian/maven.cleanIgnoreRules 2011-09-11 15:33:49 UTC (rev 14820) @@ -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/ + Added: trunk/libcommons-dbcp-java/debian/maven.ignoreRules =================================================================== --- trunk/libcommons-dbcp-java/debian/maven.ignoreRules (rev 0) +++ trunk/libcommons-dbcp-java/debian/maven.ignoreRules 2011-09-11 15:33:49 UTC (rev 14820) @@ -0,0 +1,28 @@ +# 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/ + +commons-logging commons-logging * * * * +junit junit * * * * +org.apache.geronimo.modules geronimo-transaction * * * * +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-changes-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-pmd-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * +org.codehaus.mojo cobertura-maven-plugin * * * * +org.codehaus.mojo findbugs-maven-plugin * * * * +tomcat naming-common * * * * +tomcat naming-java * * * * Added: trunk/libcommons-dbcp-java/debian/maven.properties =================================================================== --- trunk/libcommons-dbcp-java/debian/maven.properties (rev 0) +++ trunk/libcommons-dbcp-java/debian/maven.properties 2011-09-11 15:33:49 UTC (rev 14820) @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true Added: trunk/libcommons-dbcp-java/debian/maven.publishedRules =================================================================== --- trunk/libcommons-dbcp-java/debian/maven.publishedRules (rev 0) +++ trunk/libcommons-dbcp-java/debian/maven.publishedRules 2011-09-11 15:33:49 UTC (rev 14820) @@ -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/libcommons-dbcp-java/debian/maven.rules =================================================================== --- trunk/libcommons-dbcp-java/debian/maven.rules 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/maven.rules 2011-09-11 15:33:49 UTC (rev 14820) @@ -1,3 +1,19 @@ -junit junit jar s/3\..*/3.x/ * -s/org.apache.geronimo.specs/glassfish/ s/geronimo-jta_1.1_spec/javaee/ jar s/.*/debian/ -commons-collections commons-collections 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/ + +commons-dbcp commons-dbcp jar s/.*/debian/ * * Added: trunk/libcommons-dbcp-java/debian/patches/0001-configure-source-and-target-version-1.5.patch =================================================================== --- trunk/libcommons-dbcp-java/debian/patches/0001-configure-source-and-target-version-1.5.patch (rev 0) +++ trunk/libcommons-dbcp-java/debian/patches/0001-configure-source-and-target-version-1.5.patch 2011-09-11 15:33:49 UTC (rev 14820) @@ -0,0 +1,28 @@ +From: Torsten Werner <[email protected]> +Date: Sun, 11 Sep 2011 17:24:30 +0200 +Subject: configure source and target version 1.5 + +--- + pom.xml | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/pom.xml b/pom.xml +index bff49ea..e145e42 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -265,6 +265,14 @@ + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <configuration> ++ <source>1.5</source> ++ <target>1.5</target> ++ </configuration> ++ </plugin> + </plugins> + </build> + <reporting> +-- Deleted: trunk/libcommons-dbcp-java/debian/patches/01_build.patch =================================================================== --- trunk/libcommons-dbcp-java/debian/patches/01_build.patch 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/patches/01_build.patch 2011-09-11 15:33:49 UTC (rev 14820) @@ -1,24 +0,0 @@ -Description: Cleanup upstream build.xml: - - Use local Javadoc index from default-jdk-doc - - Set test.failonerror to false -Origin: vendor -Forwarded: not-needed -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-02-20 ---- a/build.xml -+++ b/build.xml -@@ -179,8 +179,8 @@ - nohelp="true" - nonavbar="false" - serialwarn="false"> -- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> -- <link href="http://commons.apache.org/pool/apidocs"/> -+ <link href="/usr/share/doc/default-jdk-doc/api/"/> -+ <link href="/usr/share/doc/libcommons-pool-java/api/"/> - </javadoc> - </target> - ---- /dev/null -+++ b/build.properties -@@ -0,0 +1 @@ -+test.failonerror=false Modified: trunk/libcommons-dbcp-java/debian/patches/series =================================================================== --- trunk/libcommons-dbcp-java/debian/patches/series 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/patches/series 2011-09-11 15:33:49 UTC (rev 14820) @@ -1 +1 @@ -01_build.patch +0001-configure-source-and-target-version-1.5.patch Modified: trunk/libcommons-dbcp-java/debian/rules =================================================================== --- trunk/libcommons-dbcp-java/debian/rules 2011-09-11 13:06:21 UTC (rev 14819) +++ trunk/libcommons-dbcp-java/debian/rules 2011-09-11 15:33:49 UTC (rev 14820) @@ -1,28 +1,9 @@ #!/usr/bin/make -f -# debian/rules for libcommons-dbcp-java include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := commons-collections3 commons-pool junit glassfish-javaee +JAVA_HOME := /usr/lib/jvm/default-java -PACKAGE=commons-dbcp - -DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILD_TARGET := build -#DEB_ANT_CHECK_TARGET := test - -# Per Debian Java Policy, install a versioned JAR and an unversioned symlink -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE).jar - -clean:: - -rm -rf debian/tmp - -rm -fr doc/api - get-orig-source: - uscan --force-download --rename - # From SVN - # sh debian/orig-tar.sh --upstream-release $(DEB_UPSTREAM_VERSION) + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
