[uimaj] 03/06: Ignore the new uimaj-json module
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jun 1 15:21:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository uimaj.
commit 6ba1637e0f5b93340b9ddcecfd0604778fdab6f6
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jun 1 16:51:33 2015 +0200
Ignore the new uimaj-json module
---
debian/changelog | 1 +
debian/libuima-core-java.poms | 1 +
debian/patches/modules.diff | 12 ++++++------
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eb7536e..9196f7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ uimaj (2.7.0-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
+ - Ignore the new uimaj-json module
-- Emmanuel Bourg <ebourg at apache.org> Mon, 01 Jun 2015 13:03:49 +0200
diff --git a/debian/libuima-core-java.poms b/debian/libuima-core-java.poms
index 65d1549..5c27391 100644
--- a/debian/libuima-core-java.poms
+++ b/debian/libuima-core-java.poms
@@ -49,6 +49,7 @@ jcasgen-maven-plugin/pom.xml --has-package-version --package=libuima-tools-java
jVinci/pom.xml --has-package-version --package=libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar
uimaj-examples/pom.xml --has-package-version --package=uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar
+uimaj-json/pom.xml --ignore
uima-docbook-overview-and-setup/pom.xml --ignore-pom
uima-docbook-references/pom.xml --ignore-pom
diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff
index 53d3f86..e4cfbd4 100644
--- a/debian/patches/modules.diff
+++ b/debian/patches/modules.diff
@@ -48,11 +48,11 @@ Forwarded: not-needed
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-cas-editor</artifactId>
-@@ -154,6 +155,7 @@
- <artifactId>uimaj-ep-launcher</artifactId>
+@@ -159,6 +160,7 @@
+ <artifactId>uimaj-json</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
+-->
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-json</artifactId>
+ </dependencies>
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git
More information about the pkg-java-commits
mailing list