[jackson-module-afterburner] 06/08: Enabled the OSGi metadata

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jackson-module-afterburner.

commit aa339c538803409612fb96aed58e76a4ee686f41
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 11 15:55:10 2016 +0200

    Enabled the OSGi metadata
---
 debian/changelog                          |  1 +
 debian/control                            |  1 +
 debian/patches/add-junit-dependency.patch | 15 +++++----------
 debian/patches/dont-osgi-bundle.patch     | 19 -------------------
 debian/patches/fix-using-bundle.patch     | 15 +++++++++++++++
 debian/patches/series                     |  2 +-
 6 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa3b65d..1287280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ jackson-module-afterburner (2.7.1-1) UNRELEASED; urgency=medium
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
+  * Enabled the OSGi metadata
 
  -- tony mancill <tmancill at debian.org>  Thu, 13 Nov 2014 20:12:12 -0800
 
diff --git a/debian/control b/debian/control
index fb88f2d..88c8f8f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
  libjackson2-databind-java,
  maven-debian-helper,
  xmlstarlet,
+ libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-shade-plugin-java,
  libasm-java (>= 5.0)
diff --git a/debian/patches/add-junit-dependency.patch b/debian/patches/add-junit-dependency.patch
index bd92e94..ded8f74 100644
--- a/debian/patches/add-junit-dependency.patch
+++ b/debian/patches/add-junit-dependency.patch
@@ -1,16 +1,11 @@
 Description: Add junit as a test dependency
  Add junit as a test dependency to the project's pom.xml file.
 Author: Tim Potter <tpot at hp.com>
-Forwarded: No
-Last-Update: 2014-11-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: jackson-module-afterburner-2.4.3/pom.xml
-===================================================================
---- jackson-module-afterburner-2.4.3.orig/pom.xml
-+++ jackson-module-afterburner-2.4.3/pom.xml
-@@ -86,6 +86,12 @@ com.fasterxml.jackson.module.afterburner
-       <version>${jackson.annotation.version}</version>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -69,6 +69,12 @@
+       <artifactId>jackson-annotations</artifactId>
        <scope>test</scope>
      </dependency>
 +    <dependency>
diff --git a/debian/patches/dont-osgi-bundle.patch b/debian/patches/dont-osgi-bundle.patch
deleted file mode 100644
index b0b6575..0000000
--- a/debian/patches/dont-osgi-bundle.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Disable OSGI bundling
- OSGI bundling is not supported or required for Debian.
-Author: Tim Potter <tpot at hp.com>
-Forwarded: No
-Last-Update: 2014-11-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: jackson-module-afterburner-2.4.3/pom.xml
-===================================================================
---- jackson-module-afterburner-2.4.3.orig/pom.xml
-+++ jackson-module-afterburner-2.4.3/pom.xml
-@@ -9,7 +9,6 @@
-   <artifactId>jackson-module-afterburner</artifactId>
-   <name>Jackson-module-Afterburner</name>
-   <version>2.4.3</version>
--  <packaging>bundle</packaging>
-   <description>Jackson (https://github.com/FasterXML/jackson) extension module
- used to enhance access functionality using bytecode generation.
-   </description>
diff --git a/debian/patches/fix-using-bundle.patch b/debian/patches/fix-using-bundle.patch
new file mode 100644
index 0000000..0dfc445
--- /dev/null
+++ b/debian/patches/fix-using-bundle.patch
@@ -0,0 +1,15 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -124,6 +124,12 @@
+           </execution>
+         </executions>
+       </plugin>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <version>2.3.5</version>
++        <extensions>true</extensions>
++      </plugin>
+     </plugins>
+   </build>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index 7a9ca17..ce37b39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-dont-osgi-bundle.patch
+fix-using-bundle.patch
 add-junit-dependency.patch

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