[pkg-java] r17101 - in trunk/libcommons-validator-java/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Tue Jul 30 14:17:39 UTC 2013
Author: ebourg-guest
Date: 2013-07-30 14:17:39 +0000 (Tue, 30 Jul 2013)
New Revision: 17101
Added:
trunk/libcommons-validator-java/debian/libcommons-validator-java.classpath
trunk/libcommons-validator-java/debian/maven.ignoreRules
Removed:
trunk/libcommons-validator-java/debian/ant.properties
trunk/libcommons-validator-java/debian/orig-tar.sh
trunk/libcommons-validator-java/debian/patches/build.patch
trunk/libcommons-validator-java/debian/pom.xml
Modified:
trunk/libcommons-validator-java/debian/README.Debian
trunk/libcommons-validator-java/debian/changelog
trunk/libcommons-validator-java/debian/control
trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.doc-base
trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs
trunk/libcommons-validator-java/debian/libcommons-validator-java.poms
trunk/libcommons-validator-java/debian/maven.rules
trunk/libcommons-validator-java/debian/patches/series
trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff
trunk/libcommons-validator-java/debian/rules
trunk/libcommons-validator-java/debian/watch
Log:
New upstream release (1.4.0)
Refreshed the patches
Switched the build to Maven
Removed debian/orig-tar.sh and use the upstream tarball as is
debian/rules: Install the upstream changelog
Removed the no longer used dependency on liboro-java
Added the Classpath attribute in the manifest of the jar
Modified: trunk/libcommons-validator-java/debian/README.Debian
===================================================================
--- trunk/libcommons-validator-java/debian/README.Debian 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/README.Debian 2013-07-30 14:17:39 UTC (rev 17101)
@@ -11,7 +11,6 @@
commons-collections.jar
commons-digester.jar
commons-logging.jar
-oro.jar
If you did install libcommons-validator-java, you already have the
correct dependencies. You'll find all the necessary packages in
Deleted: trunk/libcommons-validator-java/debian/ant.properties
===================================================================
--- trunk/libcommons-validator-java/debian/ant.properties 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/ant.properties 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,10 +0,0 @@
-build.sysclasspath=only
-compile.target=1.3
-dojo_custom_rhino.jar=/usr/share/yui-compressor/yui-compressor.jar
-commons-beanutils.jar=/usr/share/java/commons-beanutils.jar
-commons-digester.jar=/usr/share/java/commons-digester.jar
-commons-logging.jar=/usr/share/java/commons-logging.jar
-oro.jar=/usr/share/java/oro.jar
-junit.jar=/usr/share/java/junit.jar
-xerces.jar=/usr/share/java/xercesImpl.jar
-skip.download=true
Modified: trunk/libcommons-validator-java/debian/changelog
===================================================================
--- trunk/libcommons-validator-java/debian/changelog 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/changelog 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,11 +1,18 @@
-libcommons-validator-java (1:1.3.1-10) UNRELEASED; urgency=low
+libcommons-validator-java (1:1.4.0-1) unstable; urgency=low
+ * New upstream release
+ * Refreshed the patches
+ * Switched the build to Maven
+ * Removed debian/orig-tar.sh and use the upstream tarball as is
+ * debian/rules: Install the upstream changelog
* debian/control:
- Updated Standards-Version to 3.9.4 (no changes)
- Use canonical URLs for the Vcs-* fields
+ - Removed the no longer used dependency on liboro-java
* debian/copyright: Fixed the Format URI
+ * Added the Classpath attribute in the manifest of the jar
- -- Emmanuel Bourg <ebourg at apache.org> Mon, 29 Jul 2013 17:49:55 +0200
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 30 Jul 2013 16:16:11 +0200
libcommons-validator-java (1:1.3.1-9) unstable; urgency=low
Modified: trunk/libcommons-validator-java/debian/control
===================================================================
--- trunk/libcommons-validator-java/debian/control 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/control 2013-07-30 14:17:39 UTC (rev 17101)
@@ -5,14 +5,16 @@
Uploaders: Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varun at debian.org>, Emmanuel Bourg <ebourg at apache.org>
Build-Depends: cdbs, debhelper (>= 7), default-jdk
Build-Depends-Indep: ant,
+ javahelper,
junit (>= 3.8.1),
libcommons-beanutils-java (>= 1.7),
libcommons-collections-java (>= 2.1),
libcommons-digester-java (>= 1.6),
libcommons-logging-java (>= 1.0.6),
- liboro-java (>= 2.0.8),
+ libmaven-antrun-plugin-java,
+ libmaven-javadoc-plugin-java,
yui-compressor,
- maven-repo-helper,
+ maven-debian-helper,
sgml-base
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-validator-java
@@ -27,7 +29,6 @@
libcommons-logging-java (>= 1.0.4),
sgml-base,
${misc:Depends}
-Recommends: liboro-java (>= 2.0.8)
Description: ease and speed development and maintenance of validation rules
The Commons Validator is a basic validation framework
that lets you define validation rules for a JavaBean
Modified: trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.doc-base
===================================================================
--- trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.doc-base 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.doc-base 2013-07-30 14:17:39 UTC (rev 17101)
@@ -7,5 +7,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libcommons-validator-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-validator-java-doc/api/*
+Index: /usr/share/doc/libcommons-validator-java-doc/apidocs/index.html
+Files: /usr/share/doc/libcommons-validator-java-doc/apidocs/*
Modified: trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs
===================================================================
--- trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,3 +1 @@
-dist/docs/api
-NOTICE.txt
-RELEASE-NOTES.txt
+target/site/apidocs
Added: trunk/libcommons-validator-java/debian/libcommons-validator-java.classpath
===================================================================
--- trunk/libcommons-validator-java/debian/libcommons-validator-java.classpath (rev 0)
+++ trunk/libcommons-validator-java/debian/libcommons-validator-java.classpath 2013-07-30 14:17:39 UTC (rev 17101)
@@ -0,0 +1 @@
+usr/share/java/commons-validator.jar commons-logging.jar commons-beanutils.jar commons-collections.jar commons-digester.jar
Modified: trunk/libcommons-validator-java/debian/libcommons-validator-java.poms
===================================================================
--- trunk/libcommons-validator-java/debian/libcommons-validator-java.poms 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/libcommons-validator-java.poms 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1 +1,28 @@
-debian/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 and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --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. [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. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --has-package-version --no-parent --java-lib
Added: trunk/libcommons-validator-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-validator-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libcommons-validator-java/debian/maven.ignoreRules 2013-07-30 14:17:39 UTC (rev 17101)
@@ -0,0 +1,7 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.codehaus.mojo clirr-maven-plugin * * * *
+org.codehaus.mojo cobertura-maven-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
Modified: trunk/libcommons-validator-java/debian/maven.rules
===================================================================
--- trunk/libcommons-validator-java/debian/maven.rules 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/maven.rules 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,2 +1,5 @@
-junit junit jar s/3\..*/3.x/
+commons-beanutils commons-beanutils jar s/.*/debian/ * *
+commons-validator commons-validator jar s/.*/debian/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+junit junit jar s/3\..*/3.x/ * *
Deleted: trunk/libcommons-validator-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-validator-java/debian/orig-tar.sh 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/orig-tar.sh 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-UDIR=commons-validator-$2-src
-DDIR=libcommons-validator-java-$2
-
-# Remove ^M CRLF line terminators
-tar -z -x -f $3
-mv $UDIR $DDIR
-(cd $DDIR; find -type f|xargs perl -pi -e 's/\r$//g')
-GZIP=--best tar -c -z -f $3 $DDIR
-rm -rf $DDIR $UDIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $3 $origDir
- echo "moved $3 to $origDir"
-fi
-
-exit 0
Deleted: trunk/libcommons-validator-java/debian/patches/build.patch
===================================================================
--- trunk/libcommons-validator-java/debian/patches/build.patch 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/patches/build.patch 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,45 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -133,16 +133,6 @@
- <pathelement location="${commons-digester.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${oro.jar}"/>
-- <path refid="downloaded.lib.classpath"/>
-- </path>
--
-- <!-- Construct compile classpath -->
-- <path id="downloaded.lib.classpath">
-- <pathelement location="${download.lib.dir}/commons-beanutils.jar"/>
-- <pathelement location="${download.lib.dir}/commons-digester.jar"/>
-- <pathelement location="${download.lib.dir}/commons-logging.jar"/>
-- <pathelement location="${download.lib.dir}/oro.jar"/>
-- <pathelement location="${download.lib.dir}/junit.jar"/>
- </path>
-
- <!-- ========== Test Execution Defaults =================================== -->
-@@ -158,7 +148,6 @@
- <pathelement location="${oro.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${xerces.jar}"/>
-- <path refid="downloaded.lib.classpath"/>
- </path>
-
- <!-- Should all tests fail if one does? -->
-@@ -262,7 +251,7 @@
- description="Initializes Javadoc directories">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/docs"/>
-- <mkdir dir="${dist.home}/docs/apidocs"/>
-+ <mkdir dir="${dist.home}/docs/api"/>
- <mkdir dir="${dist.home}/docs/javascript"/>
- <mkdir dir="${dist.home}/docs/javascript/org/apache/commons/validator/javascript/doc-files"/>
- </target>
-@@ -293,7 +282,7 @@
- <target name="javadoc" depends="compile, javadoc.js"
- description="Create component Javadoc documentation">
- <javadoc sourcepath="${source.home}"
-- destdir="${dist.home}/docs/apidocs"
-+ destdir="${dist.home}/docs/api"
- packagenames="org.apache.commons.*"
- author="true"
- private="true"
Modified: trunk/libcommons-validator-java/debian/patches/series
===================================================================
--- trunk/libcommons-validator-java/debian/patches/series 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/patches/series 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,2 +1 @@
-build.patch
yui_compressor_params.diff
Modified: trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff
===================================================================
--- trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,17 +1,32 @@
Description: As we use yui-compressor to minify .js files,
remove -c param from call to JAR file for yui-c.
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2012-01-08
-Forwarded: no
-Index: b/build.xml
-===================================================================
---- a/build.xml
-+++ b/build.xml
-@@ -387,7 +387,6 @@
+Forwarded: not-needed
+--- a/build-javascript.xml
++++ b/build-javascript.xml
+@@ -84,7 +84,6 @@
+ </concat>
+ <echo message="Compressing ${final.name}.js"/>
+ <java jar="${compressor.jar}" fork="true" output="${dist.dir}/${final.name}-compress.js">
+- <arg value="-c"/>
+ <arg value="${dist.dir}/${final.name}.js"/>
+ </java>
- <java jar="${dojo_custom_rhino.jar}" fork="true"
- output="${jsfilename}-compress.js">
-- <arg value="-c"/>
- <arg value="${jsfilename}.js"/>
- </java>
- </target>
+@@ -135,7 +134,6 @@
+ <target name="compress-file">
+ <echo message="Compressing ${jsfilename}.js"/>
+ <java jar="${compressor.jar}" fork="true" output="${javascript.output}/${jsfilename}-compress.js">
+- <arg value="-c"/>
+ <arg value="${javascript.input}/${jsfilename}.js"/>
+ </java>
+ </target>
+--- a/pom.xml
++++ b/pom.xml
+@@ -174,6 +174,7 @@
+ <property name="build.dir" value="${project.build.directory}" />
+ <property name="output.dir" value="${project.build.outputDirectory}" />
+ <property name="final.name" value="${project.build.finalName}" />
++ <property name="compressor.jar" value="/usr/share/yui-compressor/yui-compressor.jar" />
+ </ant>
+ </tasks>
+ </configuration>
Deleted: trunk/libcommons-validator-java/debian/pom.xml
===================================================================
--- trunk/libcommons-validator-java/debian/pom.xml 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/pom.xml 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <name>Validator</name>
- <version>1.3.1</version>
- <description>Commons Validator provides the building blocks for both client side validation
- and server side data validation. It may be used standalone or with a framework like
- Struts.</description>
- <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
- <issueManagement>
- <url>http://issues.apache.org/jira/</url>
- </issueManagement>
- <ciManagement>
- <notifiers>
- <notifier>
- <configuration>
- <address>commons-dev at jakarta.apache.org</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
- <inceptionYear>2002</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Commons Dev List</name>
- <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
- <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Commons User List</name>
- <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
- <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <id>mrdon</id>
- <name>Don Brown</name>
- <email>mrdon at apache.org</email>
- </developer>
- <developer>
- <id>martinc</id>
- <name>Martin Cooper</name>
- <email>martinc at apache.org</email>
- </developer>
- <developer>
- <id>dgraham</id>
- <name>David Graham</name>
- <email>dgraham at apache.org</email>
- </developer>
- <developer>
- <id>husted</id>
- <name>Ted Husted</name>
- <email>husted at apache.org</email>
- </developer>
- <developer>
- <id>rleland</id>
- <name>Rob Leland</name>
- <email>rleland at apache.org</email>
- </developer>
- <developer>
- <id>craigmcc</id>
- <name>Craig McClanahan</name>
- <email>craigmcc at apache.org</email>
- </developer>
- <developer>
- <id>jmitchell</id>
- <name>James Mitchell</name>
- <email>jmitchell NOSPAM apache.org</email>
- <organization>EdgeTech, Inc</organization>
- </developer>
- <developer>
- <id>niallp</id>
- <name>Niall Pemberton</name>
- </developer>
- <developer>
- <id>turner</id>
- <name>James Turner</name>
- <email>turner at apache.org</email>
- </developer>
- <developer>
- <id>dwinterfeldt</id>
- <name>David Winterfeldt</name>
- <email>dwinterfeldt at apache.org</email>
- </developer>
- <developer>
- <id>bayard</id>
- <name>Henri Yandell</name>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Saul Q Yuan Add</name>
- </contributor>
- <contributor>
- <name>Shane Bailey</name>
- </contributor>
- <contributor>
- <name>Dave Derry</name>
- </contributor>
- <contributor>
- <name>Tim O'Brien</name>
- </contributor>
- <contributor>
- <name>Scott Clasen</name>
- <email>ticktock at speakeasy.net></email>
- </contributor>
- <contributor>
- <name>Marcus Brito Finish</name>
- </contributor>
- <contributor>
- <name>Padma Ginnaram</name>
- </contributor>
- <contributor>
- <name>Thomas Jacob</name>
- <email>thomas.jacob at sinnerschrader.com</email>
- </contributor>
- <contributor>
- <name>Adam Kramer</name>
- </contributor>
- <contributor>
- <name>Greg Ludington</name>
- </contributor>
- <contributor>
- <name>Bjorn-H. Moritz</name>
- </contributor>
- <contributor>
- <name>David Neuer</name>
- <email>DavidNeuer at nascopgh.com</email>
- </contributor>
- <contributor>
- <name>Kurt Post</name>
- </contributor>
- <contributor>
- <name>Arun Mammen Thomas</name>
- </contributor>
- <contributor>
- <name>Steven Fines</name>
- <email>steven.fines at cotelligent.com</email>
- </contributor>
- <contributor>
- <name>Didier Romelot</name>
- <email>didier.romelot at renault.com</email>
- </contributor>
- <contributor>
- <name>Steve Stair</name>
- </contributor>
- <contributor>
- <name>Jeremy Tan</name>
- <email>jeremytan at scualum.com</email>
- </contributor>
- <contributor>
- <name>94RGt2</name>
- <email>lmagee at biziworks.com.au</email>
- </contributor>
- <contributor>
- <name>Nacho G. Mac Dowell</name>
- </contributor>
- <contributor>
- <name>Mark Lowe</name>
- <email>mark.lowe at boxstuff.com</email>
- </contributor>
- </contributors>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>/LICENSE.txt</url>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
- <url>http://svn.apache.org/viewvc</url>
- </scm>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://jakarta.apache.org</url>
- </organization>
- <build>
- <sourceDirectory>src/share</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>${pom.build.unitTestSourceDirectory}</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/routines/BaseCalendarValidatorTest.java</exclude>
- <exclude>**/routines/BaseNumberValidatorTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-xdoc-plugin</artifactId>
- <version>1.9.2</version>
- <configuration>
- <comment><strong>Site Only</strong> - v1.9.2 (minimum)
- required for building the Validator Site documentation.</comment>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>1.8.2</version>
- <configuration>
- <comment><strong>Site Only</strong> - v1.8.2 (minimum)
- required for building the Validator Site documentation.</comment>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <version>1.6</version>
- <configuration>
- <comment><strong>Site Only</strong> - v1.6 (minimum)
- required for building the Validator Site documentation.</comment>
- </configuration>
- </plugin>
- <plugin>
- <groupId>maven-plugins</groupId>
- <artifactId>maven-cobertura-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <scope>test</scope>
- <comment>Required only for generating test coverage reports.</comment>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <distributionManagement>
- <repository>
- <id>default</id>
- <name>Default Repository</name>
- <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
- </repository>
- <site>
- <id>default</id>
- <name>Default Site</name>
- <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
- </site>
- <status>converted</status>
- </distributionManagement>
-</project>
\ No newline at end of file
Modified: trunk/libcommons-validator-java/debian/rules
===================================================================
--- trunk/libcommons-validator-java/debian/rules 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/rules 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,32 +1,24 @@
#!/usr/bin/make -f
# debian/rules for libcommons-validator-java (uses CDBS)
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
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
+
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := junit commons-beanutils commons-collections commons-digester commons-logging oro
-DEB_ANT_BUILD_TARGET := dist
-install/$(PACKAGE)::
- cp conf/share/*.dtd dist/
- $(RM) dist/RELEASE-NOTES.txt
- dh_install -p$(PACKAGE) dist/*.dtd usr/share/sgml/apache/jakarta/validator
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l debian/pom.xml dist/commons-validator-$(VERSION).jar
+DEB_MAVEN_DOC_TARGET := javadoc:javadoc
+DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+binary-post-install/$(PACKAGE)::
+ dh_install -p$(PACKAGE) src/main/resources/org/apache/commons/validator/resources/*.dtd usr/share/sgml/apache/jakarta/validator
+ jh_classpath -p$(PACKAGE)
+
clean::
$(RM) debian/install debian/sgmlcatalogs
-mh_clean
get-orig-source:
-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-get-orig-pom:
- wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/commons-validator/commons-validator/$(VERSION)/commons-validator-$(VERSION).pom
-
Modified: trunk/libcommons-validator-java/debian/watch
===================================================================
--- trunk/libcommons-validator-java/debian/watch 2013-07-30 09:07:51 UTC (rev 17100)
+++ trunk/libcommons-validator-java/debian/watch 2013-07-30 14:17:39 UTC (rev 17101)
@@ -1,3 +1,2 @@
version=3
-http://www.apache.org/dist/commons/validator/source/ \
- commons-validator-(.*)-src\.tar\.gz debian debian/orig-tar.sh
+http://archive.apache.org/dist/commons/validator/source/ commons-validator-(.*)-src\.tar\.gz
More information about the pkg-java-commits
mailing list