[openhft-compiler] 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-compiler.

commit 13ba48ebbf194a2d3850948a7145e44578939f4f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 31 17:58:24 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 0141f9f..a085e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openhft-compiler (2.2.0-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 ce460a5..e52ad82 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,
                libslf4j-java,
                maven-debian-helper (>= 2.0),
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b924310..5704134 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -3,4 +3,3 @@ com.sun.java tools * * * *
 junit junit * * * *
 net.openhft third-party-bom * * * *
 org.apache.servicemix.tooling depends-maven-plugin * * * *
-org.kohsuke.jetbrains annotations * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index da0f24d..9dc4287 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,4 @@
 
 net.openhft Java-Runtime-Compiler pom s/.*/debian/ * *
 net.openhft compiler bundle 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 2caec66..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/compiler/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/compiler/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 05cfb16..7bbef60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-add-jetbrains-annotations.patch
 02-ignore-sun-api.patch
diff --git a/debian/rules b/debian/rules
index e9601b0..bc220cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,5 @@ override_dh_auto_install:
 	# Remove an unused pom
 	rm -Rf debian/libopenhft-compiler-java/usr/share/maven-repo/net/openhft/Java-Runtime-Compiler
 
-	# Remove the Jetbrains annotations
-	zip --delete debian/libopenhft-compiler-java/usr/share/java/openhft-compiler.jar org*
-
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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