[libxbean-java] 07/08: Updated the dependencies

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libxbean-java.

commit bc4daed7f9d32682ad198146f83d7ecfe4a641c8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 29 09:18:28 2014 +0200

    Updated the dependencies
---
 debian/changelog         | 3 +++
 debian/control           | 9 +++++----
 debian/maven.ignoreRules | 4 +++-
 debian/maven.rules       | 5 +++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57727cb..78ea671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ libxbean-java (4.0-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches and removed fix_osgi43.diff (updated upstream)
     - Build the new xbean-asm-util module
+    - Replaced the dependency on libasm3-java with libasm4-java
+    - Added a new dependency on libequinox-osgi-java
+    - Added a build dependency on junit4
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
   * Moved the package to Git
diff --git a/debian/control b/debian/control
index 2ed4140..f3016c7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,13 @@ Build-Depends: debhelper (>= 9), cdbs, default-jdk, quilt,
 # For full Maven build :
  maven-debian-helper (>= 1.4.4)
 Build-Depends-Indep: maven-repo-helper, ant, ant-optional,
- libcommons-logging-java, liblog4j1.2-java, libasm3-java, groovy (>= 1.8.6-4~),
+ libcommons-logging-java, liblog4j1.2-java, libasm4-java, groovy (>= 1.8.6-4~),
 # For full Maven build :
  libspring-core-java, libspring-beans-java, libspring-context-java,
  libspring-web-java, libqdox-java, libosgi-core-java, libosgi-compendium-java, libslf4j-java,
  libmaven-antrun-plugin-java, libmaven-bundle-plugin-java, libmaven-install-plugin-java,
  libmaven-javadoc-plugin-java, libcglib-java, libmaven-shade-plugin-java,
- libmaven-plugin-tools-java (>= 2.8),
+ libmaven-plugin-tools-java (>= 2.8), libequinox-osgi-java, junit4,
 # For bootstrap build :
  maven-ant-helper (>> 4)
 Standards-Version: 3.9.6
@@ -25,9 +25,10 @@ Homepage: http://geronimo.apache.org/xbean/
 Package: libxbean-java
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libcommons-logging-java, liblog4j1.2-java, libasm3-java
+Recommends: libcommons-logging-java, liblog4j1.2-java, libasm4-java
 Suggests: groovy, libspring-core-java, libspring-beans-java, libspring-context-java,
- libspring-web-java, libqdox-java, libosgi-core-java, libosgi-compendium-java, libslf4j-java
+ libspring-web-java, libqdox-java, libosgi-core-java, libosgi-compendium-java, libslf4j-java,
+ libequinox-osgi-java
 Description: plugin based Java application server
  The goal of XBean project is to created a plugin based server analogous to
  Eclipse being a plugin based IDE. XBean will be able to discover, download and
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 15fb90c..dde65ca 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -17,8 +17,10 @@
 org.apache.maven.plugins maven-idea-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.plugins maven-remote-resources-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
 org.apache.xbean maven-xbean-plugin maven-plugin * * *
+org.apache.rat apache-rat-plugin * * * *
 
 org.ops4j.pax.logging pax-logging-api * * * *
 org.ops4j.pax.logging pax-logging-service * * * *
-org.apache.aries.blueprint org.apache.aries.blueprint * * * *
\ No newline at end of file
+org.apache.aries.blueprint org.apache.aries.blueprint * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 2644d64..6aa72ed 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,12 +17,13 @@
 #   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-asm * * s/2\..*/2.x/ * *
-asm * * s/3\..*/3.x/ * *
+org.ow2.asm * * s/.*/4.x/ * *
 s/groovy/org.codehaus.groovy/ groovy* * s/.*/1.x/ * *
 org.springframework * * s/.*/3.x/ * *
 s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
 s/org.apache.commons/commons-jexl/ commons-jexl jar s/.*/debian/ * *
+s/org.eclipse/org.eclipse.osgi/ s/osgi/org.eclipse.osgi * s/.*/debian/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxbean-java.git