[uima-addons] 03/06: Add java9.patch and fix FTBFS with Java 9.

Markus Koschany apo at moszumanska.debian.org
Fri Oct 27 18:46:55 UTC 2017


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

apo pushed a commit to branch master
in repository uima-addons.

commit 58c2b8063be49ab675c5860837d8746481a3687b
Author: Markus Koschany <apo at debian.org>
Date:   Fri Oct 27 20:26:01 2017 +0200

    Add java9.patch and fix FTBFS with Java 9.
    
    Thanks: Chris West for the report.
    Closes: #874007
---
 debian/patches/java9.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 59 insertions(+)

diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..04968ba
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,58 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 27 Oct 2017 20:25:41 +0200
+Subject: java9
+
+Compile for Java 8 or later to avoid a FTBFS with Java 9. The default value was
+1.4.
+
+Bug-Debian: https://bugs.debian.org/874007
+Forwarded: no
+---
+ DictionaryAnnotator/pom.xml        | 1 +
+ RegularExpressionAnnotator/pom.xml | 1 +
+ SimpleServer/pom.xml               | 3 ++-
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/DictionaryAnnotator/pom.xml b/DictionaryAnnotator/pom.xml
+index 58be0c3..9e79bee 100644
+--- a/DictionaryAnnotator/pom.xml
++++ b/DictionaryAnnotator/pom.xml
+@@ -146,6 +146,7 @@
+             <goals><goal>xmlbeans</goal></goals>
+             <configuration>
+               <schemaDirectory>resources</schemaDirectory>
++              <javaSource>1.8</javaSource>
+             </configuration>        
+           </execution>
+         </executions>
+diff --git a/RegularExpressionAnnotator/pom.xml b/RegularExpressionAnnotator/pom.xml
+index abc15e0..73c5571 100644
+--- a/RegularExpressionAnnotator/pom.xml
++++ b/RegularExpressionAnnotator/pom.xml
+@@ -154,6 +154,7 @@
+             <goals><goal>xmlbeans</goal></goals>
+             <configuration>
+               <schemaDirectory>resources</schemaDirectory>
++              <javaSource>1.8</javaSource>
+             </configuration>        
+           </execution>
+         </executions>
+diff --git a/SimpleServer/pom.xml b/SimpleServer/pom.xml
+index 030203b..23ef830 100644
+--- a/SimpleServer/pom.xml
++++ b/SimpleServer/pom.xml
+@@ -166,6 +166,7 @@
+             <goals><goal>xmlbeans</goal></goals>
+             <configuration>
+               <schemaDirectory>src/main/resources</schemaDirectory>
++              <javaSource>1.8</javaSource>
+             </configuration>        
+           </execution>
+         </executions>
+@@ -173,4 +174,4 @@
+ 
+ 	  </plugins>
+ 	</build>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/debian/patches/series b/debian/patches/series
index ce239ab..ef2b1ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 maven_modules.diff
 httpclient.diff
 jetty-compatibility.patch
+java9.patch

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



More information about the pkg-java-commits mailing list