[pkg-java] r16735 - trunk/commons-configuration/debian

Fri May 24 12:26:48 UTC 2013

Author: ebourg-guest
Date: 2013-05-24 12:26:48 +0000 (Fri, 24 May 2013)
New Revision: 16735

Modified:
   trunk/commons-configuration/debian/changelog
   trunk/commons-configuration/debian/control
   trunk/commons-configuration/debian/libcommons-configuration-java.poms
   trunk/commons-configuration/debian/maven.ignoreRules
   trunk/commons-configuration/debian/maven.rules
Log:
New upstream release (1.9)
Added new build dependencies (libjavacc-maven-plugin-java, junit4)
Upgraded the dependency on the Servlet API (2.5 -> 3.0)
Removed the dependency on the Activation Framework (glassfish-activation)
Replaced the dependency on glassfish-mail with libgnumail-java
Removed the unused dependencies: liblog4j1.2-java-doc, libmaven-assembly-plugin-java
Updated Standards-Version to 3.9.4 (no changes)
debian/watch: Changed to point the official Apache distribution server
Removed the obsolete file debian/ant.properties



Modified: trunk/commons-configuration/debian/changelog
===================================================================

--- trunk/commons-configuration/debian/changelog	2013-05-24 04:16:14 UTC (rev 16734)
+++ trunk/commons-configuration/debian/changelog	2013-05-24 12:26:48 UTC (rev 16735)
@@ -1,14 +1,17 @@
 commons-configuration (1.9-1) unstable; urgency=low
 
   * New upstream release
-  * Updated Standards-Version to 3.9.4 (no changes)
+  * Added new build dependencies (libjavacc-maven-plugin-java, junit4)
   * Upgraded the dependency on the Servlet API (2.5 -> 3.0)
   * Removed the dependency on the Activation Framework (glassfish-activation)
-  * Added the dependency on junit4
+  * Replaced the dependency on glassfish-mail with libgnumail-java
+  * Removed the unused dependencies:
+    liblog4j1.2-java-doc, libmaven-assembly-plugin-java
+  * Updated Standards-Version to 3.9.4 (no changes)
   * debian/watch: Changed to point the official Apache distribution server
   * Removed the obsolete file debian/ant.properties
 
- -- Emmanuel Bourg <ebourg at apache.org>  Thu, 16 May 2013 21:50:33 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 24 May 2013 13:54:43 +0200
 
 commons-configuration (1.7-1) unstable; urgency=low
 

Modified: trunk/commons-configuration/debian/control
===================================================================
--- trunk/commons-configuration/debian/control	2013-05-24 04:16:14 UTC (rev 16734)
+++ trunk/commons-configuration/debian/control	2013-05-24 12:26:48 UTC (rev 16735)
@@ -8,7 +8,7 @@
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
 Build-Depends-Indep: ant,
                      default-jdk-doc,
-                     glassfish-mail,
+                     libgnumail-java,
                      junit4,
                      libcommons-beanutils-java,
                      libcommons-beanutils-java-doc,
@@ -30,8 +30,7 @@
                      libcommons-pool-java,
                      libcommons-vfs-java (>= 2.0),
                      libcommons-vfs-java-doc,
-                     liblog4j1.2-java-doc,
-                     libmaven-assembly-plugin-java,
+                     libjavacc-maven-plugin-java,
                      libmaven-javadoc-plugin-java,
                      libservlet3.0-java
 Standards-Version: 3.9.4

Modified: trunk/commons-configuration/debian/libcommons-configuration-java.poms
===================================================================
--- trunk/commons-configuration/debian/libcommons-configuration-java.poms	2013-05-24 04:16:14 UTC (rev 16734)
+++ trunk/commons-configuration/debian/libcommons-configuration-java.poms	2013-05-24 12:26:48 UTC (rev 16735)
@@ -1 +1,28 @@
+# 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 --no-parent

Modified: trunk/commons-configuration/debian/maven.ignoreRules
===================================================================
--- trunk/commons-configuration/debian/maven.ignoreRules	2013-05-24 04:16:14 UTC (rev 16734)
+++ trunk/commons-configuration/debian/maven.ignoreRules	2013-05-24 12:26:48 UTC (rev 16735)
@@ -1,25 +1,11 @@
-# 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 * * * *
-org.apache.maven.plugins maven-changes-plugin * * * *
-
+dbunit dbunit * * * *
+hsqldb hsqldb * * * *
 junit-addons junit-addons * * * *
+log4j log4j * * * *
 mockobjects mockobjects-core * * * *
 mockobjects mockobjects-jdk1.4-j2ee1.3 * * * *
-hsqldb hsqldb * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
 org.slf4j slf4j-ext * * * *
-dbunit dbunit * * * *
\ No newline at end of file

Modified: trunk/commons-configuration/debian/maven.rules
===================================================================
--- trunk/commons-configuration/debian/maven.rules	2013-05-24 04:16:14 UTC (rev 16734)
+++ trunk/commons-configuration/debian/maven.rules	2013-05-24 12:26:48 UTC (rev 16735)
@@ -1,8 +1,9 @@
-junit junit jar s/4\..*/4.x/
-commons-collections commons-collections jar s/2\..*/2.x/
-commons-collections commons-collections jar s/3\..*/3.x/
-s/ant/org.apache.ant/ * * s/.*/debian/
-log4j log4j jar s/1\.2\..*/1.2.x/
-# force using servlet 3.0
-javax.servlet * * s/.*/3.0/
-
+junit junit jar s/4\..*/4.x/ * *
+commons-beanutils commons-beanutils jar s/.*/debian/ * *
+commons-collections commons-collections jar s/2\..*/2.x/ * *
+commons-collections commons-collections jar s/3\..*/3.x/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+org.apache.commons commons-jexl2 jar s/.*/debian/ * *
+s/ant/org.apache.ant/ * * s/.*/debian/ * *
+javax.mail s/mail/gnumail/ jar s/.*/debian/ * *
+javax.servlet servlet-api jar s/.*/3.0/ * *


