diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2018-10-29 23:20:21 +0100 |
|---|---|---|
| committer | Emmanuel Bourg <ebourg@apache.org> | 2018-10-29 23:23:16 +0100 |
| commit | 47001231a0ba30c66c172b2ff519b3fdea7ce3b5 (patch) | |
| tree | 79f3cbac8efc03aefad9eb5a4bbfa2dd61aac9df /debian | |
| parent | fdf3b55457bb133affc067a9309bfae58c658383 (diff) | |
Removed the @Generated annotation in the template to fix the build failure with Java 11 (Closes: #912232)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/01-remove-generated-annotation.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 503277b..76e86c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ carrotsearch-hppc (0.6.1-6) UNRELEASED; urgency=medium * Team upload. + * Removed the @Generated annotation in the template to fix the build + failure with Java 11 (Closes: #912232) * Standards-Version updated to 4.2.1 * Use salsa.debian.org Vcs-* URLs diff --git a/debian/patches/01-remove-generated-annotation.patch b/debian/patches/01-remove-generated-annotation.patch new file mode 100644 index 0000000..6f52a94 --- /dev/null +++ b/debian/patches/01-remove-generated-annotation.patch @@ -0,0 +1,14 @@ +Description: Removes the @javax.annotation.Generated annotation in the template to fix the build failure with Java 11 +Author: Emmanuel Bourg <ebourg@apache.org> +Forwarded: no +--- a/hppc-templateprocessor/src/main/java/com/carrotsearch/hppc/generator/TemplateOptions.java ++++ b/hppc-templateprocessor/src/main/java/com/carrotsearch/hppc/generator/TemplateOptions.java +@@ -105,7 +105,7 @@ + + public String getGeneratedAnnotation() + { +- return "@javax.annotation.Generated(date = \"" + ++ return "//@javax.annotation.Generated(date = \"" + + getTimeNow() + "\", value = \"HPPC generated from: " + + sourceFile.getName() + "\")"; + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1612713 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-remove-generated-annotation.patch |