[openhft-chronicle-queue] 09/16: Depend on libintellij-annotations-java instead of injecting the annotations

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openhft-chronicle-queue.

commit 27ff959f1ef0c48782516c3e74fe3a827d85a35b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 3 11:51:21 2016 +0200

    Depend on libintellij-annotations-java instead of injecting the annotations
---
 debian/changelog                                  |  1 +
 debian/control                                    |  1 +
 debian/maven.ignoreRules                          |  1 -
 debian/patches/01-add-jetbrains-annotations.patch | 20 --------------------
 debian/patches/series                             |  1 -
 debian/rules                                      |  3 ---
 6 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d247978..df571ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openhft-chronicle-queue (3.6.0-1) UNRELEASED; urgency=medium
   * New upstream release
     - Ignore the new chronicle-test module
     - Depend on libopenhft-lang-java (>= 6.6.2)
+  * Depend on libintellij-annotations-java instead of injecting the annotations
   * Build with the DH sequencer instead of CDBS
   * Updated debian/watch to track the 4.x releases
   * Standards-Version updated to 3.9.8 (no changes)
diff --git a/debian/control b/debian/control
index 579fe90..ccb22cf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 9),
                default-jdk,
+               libintellij-annotations-java,
                libmaven-bundle-plugin-java,
                libopenhft-lang-java (>= 6.6.2),
                maven-debian-helper (>= 1.5),
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 214eaa7..6e290a6 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -12,7 +12,6 @@ org.apache.felix org.apache.felix.framework * * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
 org.easymock easymock * * * *
-org.kohsuke.jetbrains annotations * * * *
 org.ops4j.pax.exam pax-exam-container-native * * * *
 org.ops4j.pax.exam pax-exam-junit4 * * * *
 org.ops4j.pax.exam pax-exam-link-mvn * * * *
diff --git a/debian/patches/01-add-jetbrains-annotations.patch b/debian/patches/01-add-jetbrains-annotations.patch
deleted file mode 100644
index 7aae00c..0000000
--- a/debian/patches/01-add-jetbrains-annotations.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add the missing Jetbrains annotations (@NotNull, @Nullable)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- /dev/null
-+++ b/chronicle/src/main/java/org/jetbrains/annotations/NotNull.java
-@@ -0,0 +1,5 @@
-+package org.jetbrains.annotations;
-+
-+ at java.lang.annotation.Retention(value=java.lang.annotation.RetentionPolicy.SOURCE)
-+public @interface NotNull {
-+}
---- /dev/null
-+++ b/chronicle/src/main/java/org/jetbrains/annotations/Nullable.java
-@@ -0,0 +1,6 @@
-+package org.jetbrains.annotations;
-+
-+ at java.lang.annotation.Retention(value=java.lang.annotation.RetentionPolicy.SOURCE)
-+public @interface Nullable {
-+}
-+
diff --git a/debian/patches/series b/debian/patches/series
index 62d0c0e..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01-add-jetbrains-annotations.patch
diff --git a/debian/rules b/debian/rules
index 39f3cff..75cfd44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,5 @@ override_dh_auto_install:
 	# Remove an unused pom
 	rm -Rf debian/libopenhft-chronicle-queue-java/usr/share/maven-repo/net/openhft/Java-Chronicle
 
-	# Remove the Jetbrains annotations
-	zip --delete debian/libopenhft-chronicle-queue-java/usr/share/java/openhft-chronicle-queue.jar org*
-
 get-orig-source:
 	uscan --download-current-version --force-download --repack --compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openhft-chronicle-queue.git