[jackson-jaxrs-providers] 02/05: fix build; use jar instead of bundle

[Timo Aaltonen]

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

tjaalton pushed a commit to branch master
in repository jackson-jaxrs-providers.

commit ba6a229846fbaaff3ba2ccf33c327c9ed3082c14
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Sep 9 11:47:23 2014 +0300

    fix build; use jar instead of bundle
---
 debian/control                         |  1 -
 debian/maven.publishedRules            |  2 --
 debian/maven.rules                     |  4 ++--
 debian/patches/fix-using-bundle.diff   | 36 ----------------------------------
 debian/patches/jar-instead-bundle.diff | 22 +++++++++++++++++++++
 debian/patches/series                  |  2 +-
 6 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/debian/control b/debian/control
index 69e22ff..ccd9af1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends-Indep:
  libjackson2-parent-java (>= 2.4),
  libjackson2-module-jaxb-annotations-java (>= 2.4),
  libjsr311-api-java,
- libmaven-bundle-plugin-java,
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/jackson-jaxrs-providers.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jackson-jaxrs-providers.git
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index 3f30687..cf672d5 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1,6 +1,4 @@
 
-com.fasterxml.jackson.jaxrs jackson-jaxrs-base bundle s/2\..*/2.x/ * *
-com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider bundle s/2\..*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-providers pom s/2\..*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-base * s/2\..*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider * s/2\..*/2.x/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 1cc4439..c162a69 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,7 +1,7 @@
 
 com.fasterxml.jackson jackson-parent pom s/2\..*/2.x/ * *
-com.fasterxml.jackson.jaxrs jackson-jaxrs-base bundle s/2\..*/2.x/ * *
-com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider bundle s/2\..*/2.x/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-base * s/2\..*/2.x/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider * s/2\..*/2.x/ * *
 com.fasterxml.jackson.jaxrs jackson-jaxrs-providers pom s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-core * s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind * s/2\..*/2.x/ * *
diff --git a/debian/patches/fix-using-bundle.diff b/debian/patches/fix-using-bundle.diff
deleted file mode 100644
index 68f2e2d..0000000
--- a/debian/patches/fix-using-bundle.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/base/pom.xml b/base/pom.xml
-index 32a59c9..6cd30e8 100644
---- a/base/pom.xml
-+++ b/base/pom.xml
-@@ -49,4 +49,14 @@ ${project.groupId}.annotation.*;version=${project.version}
-     </dependency>
-     <!-- test deps should come from parent -->
-   </dependencies>
-+  <build>
-+    <plugins>
-+      <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/json/pom.xml b/json/pom.xml
-index b8d4171..4b1aec5 100644
---- a/json/pom.xml
-+++ b/json/pom.xml
-@@ -85,6 +85,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/jar-instead-bundle.diff b/debian/patches/jar-instead-bundle.diff
new file mode 100644
index 0000000..6a1af25
--- /dev/null
+++ b/debian/patches/jar-instead-bundle.diff
@@ -0,0 +1,22 @@
+--- a/base/pom.xml
++++ b/base/pom.xml
+@@ -8,7 +8,7 @@
+   </parent>
+   <artifactId>jackson-jaxrs-base</artifactId>
+   <name>Jackson-JAXRS-base</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   <description>Pile of code that is shared by all Jackson-based JAX-RS
+ providers.
+   </description>
+--- a/json/pom.xml
++++ b/json/pom.xml
+@@ -8,7 +8,7 @@
+   </parent>
+   <artifactId>jackson-jaxrs-json-provider</artifactId>
+   <name>Jackson-JAXRS-JSON</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   <description>Functionality to handle JSON input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding.
+   </description>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 88fc73c..e91f522 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 force-core-version.diff
-fix-using-bundle.diff
+jar-instead-bundle.diff

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