diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2018-12-26 21:17:38 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2018-12-26 21:17:38 +0100 |
| commit | 46b58e6aea097aa9f23a0d76e1eebf8bae06bcd9 (patch) | |
| tree | 5aeb0e4ddd4693af4a1afdda80d2f643a505af31 /debian | |
| parent | 3f98cfeb0008f9d7acfe7841384c1547045a67a6 (diff) | |
Paths have changed, update .poms/patch accordingly
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libcarrotsearch-hppc-java.poms | 4 | ||||
| -rw-r--r-- | debian/patches/01-remove-generated-annotation.patch | 27 |
2 files changed, 18 insertions, 13 deletions
diff --git a/debian/libcarrotsearch-hppc-java.poms b/debian/libcarrotsearch-hppc-java.poms index 60805da..499f782 100644 --- a/debian/libcarrotsearch-hppc-java.poms +++ b/debian/libcarrotsearch-hppc-java.poms @@ -26,7 +26,7 @@ # Empty by default. [mh_install] # pom.xml --no-parent --has-package-version -hppc-templateprocessor/pom.xml --has-package-version -hppc-core/pom.xml --has-package-version +hppc-template-processor/pom.xml --has-package-version +hppc/pom.xml --has-package-version hppc-examples/pom.xml --ignore hppc-benchmarks/pom.xml --ignore diff --git a/debian/patches/01-remove-generated-annotation.patch b/debian/patches/01-remove-generated-annotation.patch index 6f52a94..bbb28d4 100644 --- a/debian/patches/01-remove-generated-annotation.patch +++ b/debian/patches/01-remove-generated-annotation.patch @@ -1,14 +1,19 @@ 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() + "\")"; - } +--- a/hppc-template-processor/src/main/java/com/carrotsearch/hppc/generator/TemplateOptions.java ++++ b/hppc-template-processor/src/main/java/com/carrotsearch/hppc/generator/TemplateOptions.java +@@ -97,10 +97,10 @@ + + public String getGeneratedAnnotation() { + return String.format(Locale.ROOT, +- "@javax.annotation.Generated(\n" + ++ "//@javax.annotation.Generated(\n" + + " date = \"%s\",\n" + + " value = \"%s\")", + getTimeNow(), + TEMPLATE_FILE_TOKEN); + } +-} +\ No newline at end of file ++} |