[jackson-core] 01/03: depend-on-junit.diff: Prevent needing jackson-parent, add a dependency on junit to pom.xml.

[Timo Aaltonen]

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

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

commit 7ddd5fdf913b8d03e8b6b71c2bf81eeeee53b375
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Sep 24 16:35:26 2014 +0300

    depend-on-junit.diff: Prevent needing jackson-parent, add a dependency on junit to pom.xml.
---
 debian/changelog                    |  3 ++-
 debian/control                      |  1 -
 debian/libjackson2-core-java.poms   |  2 +-
 debian/maven.rules                  |  1 -
 debian/patches/depend-on-junit.diff | 20 ++++++++++++++++++++
 debian/patches/series               |  1 +
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31e4568..53ddd7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ jackson-core (2.4.2-1) UNRELEASED; urgency=medium
   * maven.{publishedR,r}ules: Fix version mangling.
   * fix-using-bundle.diff: Use extensions with bundle plugin.
   * control: Add libmaven-bundle-plugin-java to build-deps.
-  * Add support for libjackson2-parent-java.
+  * depend-on-junit.diff: Prevent needing jackson-parent, add a dependency
+    on junit to pom.xml.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Sat, 06 Sep 2014 21:19:37 +0300
 
diff --git a/debian/control b/debian/control
index ce68d4b..4eb45e4 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends:
 Build-Depends-Indep:
  default-jdk-doc,
  junit4,
- libjackson2-parent-java (>= 2.4),
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-scm-java
diff --git a/debian/libjackson2-core-java.poms b/debian/libjackson2-core-java.poms
index 1d885c3..64b1188 100644
--- a/debian/libjackson2-core-java.poms
+++ b/debian/libjackson2-core-java.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 226f323..8a470a0 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,4 @@
 
-com.fasterxml.jackson jackson-parent pom s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-core bundle s/2\..*/2.x/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.apache.maven.scm maven-scm-manager-plexus jar s/.*/debian/ * *
diff --git a/debian/patches/depend-on-junit.diff b/debian/patches/depend-on-junit.diff
new file mode 100644
index 0000000..deca14d
--- /dev/null
+++ b/debian/patches/depend-on-junit.diff
@@ -0,0 +1,20 @@
+diff --git a/pom.xml b/pom.xml
+index c90f039..59a52a5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -32,6 +32,15 @@ com.fasterxml.jackson.core.*;version=${project.version}
+     <packageVersion.package>${project.groupId}.json</packageVersion.package>
+   </properties>
+ 
++  <dependencies>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.11</version>
++      <scope>test</scope>
++    </dependency>
++  </dependencies>
++
+   <build>
+     <plugins>
+       <plugin>
diff --git a/debian/patches/series b/debian/patches/series
index c39825f..6ef8bf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-using-bundle.diff
+depend-on-junit.diff

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