[jackson-dataformat-smile] 01/05: drop using parent, add a dependency on junit to pom.xml instead

[Timo Aaltonen]

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

tjaalton pushed a commit to branch master
in repository jackson-dataformat-smile.

commit d9f7486fc3518b0d6a762757fe50e0066926155d
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Sep 24 17:23:38 2014 +0300

    drop using parent, add a dependency on junit to pom.xml instead
---
 debian/changelog                         | 3 ++-
 debian/control                           | 1 -
 debian/libjackson2-dataformat-smile.poms | 2 +-
 debian/maven.rules                       | 1 -
 debian/patches/series                    | 1 +
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1617654..9d3285b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,9 +10,10 @@ jackson-dataformat-smile (2.4.2-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * fix-bundle-build.diff: Use extensions with bundle plugin.
-  * Use jackson-parent.
   * maven.{publishedR,r}ules: Fix version mangling.
   * control: Bump libjackson2-core, -databind dependencies.
+  * depend-on-junit.diff: Prevent needing jackson-parent, add a dependency
+    on junit to pom.xml.
 
  -- Wolodja Wentland <debian at babilen5.org>  Thu, 26 Sep 2013 17:53:19 +0000
 
diff --git a/debian/control b/debian/control
index 90da199..23520a2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9),
                javahelper (>= 0.32),
                junit4,
                libjackson2-core-java (>= 2.4.2),
-               libjackson2-parent-java (>= 2.4),
                libmaven-bundle-plugin-java,
                maven-debian-helper (>= 1.6.5),
                xmlstarlet
diff --git a/debian/libjackson2-dataformat-smile.poms b/debian/libjackson2-dataformat-smile.poms
index 1d885c3..64b1188 100644
--- a/debian/libjackson2-dataformat-smile.poms
+++ b/debian/libjackson2-dataformat-smile.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --has-package-version --java-lib
+pom.xml --no-parent --has-package-version --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
index 89987ed..a86824d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -3,4 +3,3 @@ com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.dataformat jackson-dataformat-smile * s/2\..*/2.x/ * *
 junit junit jar s/4\..*/4.x/ * *
-com.fasterxml.jackson jackson-parent pom s/2\..*/2.x/ * *
diff --git a/debian/patches/series b/debian/patches/series
index d46f5cc..2460051 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-bundle-build.diff
+depend-on-junit.diff

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