[shiro] 01/07: Enable the OSGi metadata for the leaf components

[Emmanuel Bourg]

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

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

commit f5a01990ac27d5040a10e1eded8235c3648f3bfd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 16 22:37:13 2013 +0200

    Enable the OSGi metadata for the leaf components
---
 debian/control                          |  1 +
 debian/maven.ignoreRules                |  1 -
 debian/maven.rules                      | 12 -------
 debian/patches/01-bundles-to-jars.patch | 55 ---------------------------------
 4 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/debian/control b/debian/control
index 525ecb4..329ed9c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends-Indep: libapache-pom-java (>= 10),
                      libjstl1.1-java,
                      libguava-java,
                      libguice-java,
+                     libmaven-bundle-plugin-java,
                      libquartz-java,
                      libservlet2.5-java,
                      libslf4j-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 5575ff0..08bb17b 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -7,7 +7,6 @@ com.google.inject.extensions guice-multibindings * * * *
 com.google.inject.extensions guice-servlet * * * *
 hsqldb hsqldb * * * *
 log4j log4j * * * *
-org.apache.felix maven-bundle-plugin * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-gpg-plugin * * * *
 org.apache.maven.plugins maven-jxr-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 34ceba3..98792f2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,22 +8,10 @@ commons-beanutils commons-beanutils jar s/.*/debian/ * *
 javax.servlet jstl jar s/.*/1.1/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.apache apache pom s/.*/debian/ * *
-org.apache.shiro shiro-core s/bundle/jar/ s/.*/debian/ * *
 org.quartz-scheduler quartz jar s/.*/debian/ * *
 s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
 junit junit * s/4\..*/4.x/ * *
 org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * *
-org.apache.shiro shiro-aspectj * s/.*/debian/ * *
-org.apache.shiro shiro-ehcache * s/.*/debian/ * *
-org.apache.shiro shiro-features * s/.*/debian/ * *
-org.apache.shiro shiro-guice * s/.*/debian/ * *
-org.apache.shiro shiro-quartz * s/.*/debian/ * *
-org.apache.shiro shiro-root * s/.*/debian/ * *
-org.apache.shiro shiro-spring * s/.*/debian/ * *
-org.apache.shiro shiro-support * s/.*/debian/ * *
-org.apache.shiro shiro-web * s/.*/debian/ * *
-org.apache.shiro.tools shiro-tools-hasher * s/.*/debian/ * *
-org.apache.shiro.tools shiro-tools * s/.*/debian/ * *
 org.springframework * * s/3\..*/3.x/ * *
 s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
 s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
diff --git a/debian/patches/01-bundles-to-jars.patch b/debian/patches/01-bundles-to-jars.patch
index f323a2a..fd71b9a 100644
--- a/debian/patches/01-bundles-to-jars.patch
+++ b/debian/patches/01-bundles-to-jars.patch
@@ -13,61 +13,6 @@ Forwarded: not-needed
  
      <build>
          <plugins>
---- a/support/ehcache/pom.xml
-+++ b/support/ehcache/pom.xml
-@@ -29,7 +29,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <artifactId>shiro-ehcache</artifactId>
-     <name>Apache Shiro :: Support :: EHCache</name>
--    <packaging>bundle</packaging>
-+    <packaging>jar</packaging>
- 
-     <dependencies>
-         <dependency>
---- a/support/guice/pom.xml
-+++ b/support/guice/pom.xml
-@@ -29,7 +29,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <artifactId>shiro-guice</artifactId>
-     <name>Apache Shiro :: Support :: Guice</name>
--    <packaging>bundle</packaging>
-+    <packaging>jar</packaging>
- 
-     <properties>
-         <guice.version>3.0</guice.version>
---- a/support/quartz/pom.xml
-+++ b/support/quartz/pom.xml
-@@ -29,7 +29,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <artifactId>shiro-quartz</artifactId>
-     <name>Apache Shiro :: Support :: Quartz</name>
--    <packaging>bundle</packaging>
-+    <packaging>jar</packaging>
- 
-     <dependencies>
-         <dependency>
---- a/support/spring/pom.xml
-+++ b/support/spring/pom.xml
-@@ -29,7 +29,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <artifactId>shiro-spring</artifactId>
-     <name>Apache Shiro :: Support :: Spring</name>
--    <packaging>bundle</packaging>
-+    <packaging>jar</packaging>
- 
-     <dependencies>
-         <dependency>
---- a/tools/hasher/pom.xml
-+++ b/tools/hasher/pom.xml
-@@ -29,7 +29,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <artifactId>shiro-tools-hasher</artifactId>
-     <name>Apache Shiro :: Tools :: Hasher</name>
--    <packaging>bundle</packaging>
-+    <packaging>jar</packaging>
- 
-     <dependencies>
-         <dependency>
 --- a/web/pom.xml
 +++ b/web/pom.xml
 @@ -30,7 +30,7 @@

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