[openhft-lang] 04/04: 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-lang.

commit 1ef875dc66b155f0d525f7bb7a1f72ff41f69cfc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 31 17:29:07 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index cec2cc4..28e7d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openhft-lang (6.1.4-2) UNRELEASED; urgency=medium
 
   * Build with the DH sequencer instead of CDBS
+  * Depend on libintellij-annotations-java instead of injecting the annotations
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index 8ebbb25..0126782 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9),
                default-jdk,
                junit4,
                libeasymock-java,
+               libintellij-annotations-java,
                libmaven-bundle-plugin-java,
                libopenhft-compiler-java,
                maven-debian-helper (>= 2.0),
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 592c865..2b27eff 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -3,4 +3,3 @@ net.openhft lang-integration pom * * *
 net.openhft lang-osgi bundle * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
-org.kohsuke.jetbrains annotations * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index c5d0115..8e671d5 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -6,3 +6,4 @@ net.openhft compiler bundle s/.*/debian/ * *
 net.openhft compiler s/jar/bundle/ s/.*/debian/ * *
 net.openhft lang bundle s/.*/debian/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
+s/org.kohsuke.jetbrains/com.intellij/ annotations * s/.*/debian/ * *
diff --git a/debian/patches/01-add-jetbrains-annotations.patch b/debian/patches/01-add-jetbrains-annotations.patch
deleted file mode 100644
index 4a7895d..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/lang/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/lang/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
deleted file mode 100644
index 62d0c0e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-add-jetbrains-annotations.patch
diff --git a/debian/rules b/debian/rules
index 1c4a7b0..453b51e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,5 @@ override_dh_auto_install:
 	# Remove an unused pom
 	rm -Rf debian/libopenhft-lang-java/usr/share/maven-repo/net/openhft/Java-Lang
 
-	# Remove the Jetbrains annotations
-	zip --delete debian/libopenhft-lang-java/usr/share/java/openhft-lang.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-lang.git