[commons-jcs] 11/27: Use packaged CDI.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository commons-jcs.

commit 7822b3ad65fa12482296b055a9398ce6a1048dd5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 17 18:01:13 2015 +0200

    Use packaged CDI.
---
 debian/control     | 1 +
 debian/maven.rules | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index a1d0f9d..e0f1ca0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends-Indep: ant,
                      junit4,
                      libatinject-jsr330-api-java,
                      libbuild-helper-maven-plugin-java,
+                     libcdi-api-java,
                      libcommons-collections4-java,
                      libcommons-dbcp-java,
                      libcommons-httpclient-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 26dba27..b897f62 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,5 +20,6 @@ s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
 s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
 org.apache.velocity  velocity * s/.*/debian/ * *
 s/org.apache.velocity/velocity-tools/ s/velocity-tools/velocity-tools-view/ * * * *
-s/org.apache.geronimo.specs/javax.inject/ s/geronimo-atinject_1.0_spec/javax.inject/ * * * *
-org.apache.geronimo.specs s/geronimo-interceptor_1.1_spec/geronimo-interceptor_3.0_spec/ * * * *
+s/org.apache.geronimo.specs/javax.enterprise/ s/geronimo-jcdi_1.0_spec/cdi-api/ * s/.*/debian/ * *
+org.apache.geronimo.specs s/geronimo-interceptor_1.1_spec/geronimo-interceptor_3.0_spec/ * s/.*/debian/ * *
+s/org.apache.geronimo.specs/javax.inject/ s/geronimo-atinject_1.0_spec/javax.inject/ * s/.*/debian/ * *

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