[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lucene/lucene-java-version.patch lucene/makefile.mk

[Damjan Jovanovic]

 lucene/lucene-java-version.patch |   39 +++++++++++++++++++++++++++++++++++++++
 lucene/makefile.mk               |    2 ++
 2 files changed, 41 insertions(+)

New commits:
commit 2c8f68fe4180a22a07c8a5ed335861d367c665ee
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Mar 5 04:44:08 2018 +0000

    The -source and -target options passed to javac
    
    must be at least 1.6, to support building with
    Java 1.9.
    
    Patch by: me

diff --git a/lucene/lucene-java-version.patch b/lucene/lucene-java-version.patch
new file mode 100644
index 000000000000..ece4c37a0848
--- /dev/null
+++ b/lucene/lucene-java-version.patch
@@ -0,0 +1,39 @@
+--- misc/build/lucene-2.9.4/common-build.xml	2018-03-05 06:13:00.041924900 +0200
++++ misc/build/lucene-2.9.4/common-build.xml	2018-03-05 06:34:48.448742000 +0200
+@@ -58,8 +58,8 @@
+ 
+   <property name="javac.deprecation" value="off"/>
+   <property name="javac.debug" value="on"/>
+-  <property name="javac.source" value="1.4"/>
+-  <property name="javac.target" value="1.4"/>
++  <property name="javac.source" value="1.6"/>
++  <property name="javac.target" value="1.6"/>
+ 
+   <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+   <property name="javadoc.access" value="protected"/>
+--- misc/build/lucene-2.9.4/contrib/analyzers/common/build.xml	2010-11-28 02:22:13.000000000 +0200
++++ misc/build/lucene-2.9.4/contrib/analyzers/common/build.xml	2018-03-05 06:39:48.913151800 +0200
+@@ -23,8 +23,8 @@
+     Additional Analyzers
+   </description>
+ 
+-  <property name="javac.source" value="1.4" />
+-  <property name="javac.target" value="1.4" />
++  <property name="javac.source" value="1.6" />
++  <property name="javac.target" value="1.6" />
+ 	
+   <property name="build.dir" location="../../../build/contrib/analyzers/common" />
+   <property name="dist.dir" location="../../../dist/contrib/analyzers/common" />
+--- misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml	2010-11-28 02:22:11.000000000 +0200
++++ misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml	2018-03-05 06:41:07.207097100 +0200
+@@ -23,8 +23,8 @@
+     Smart Chinese Analyzer
+   </description>
+ 
+-  <property name="javac.source" value="1.4" />
+-  <property name="javac.target" value="1.4" />
++  <property name="javac.source" value="1.6" />
++  <property name="javac.target" value="1.6" />
+ 	
+   <property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
+   <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
index 4599ee569af0..3919de62ed17 100644
--- a/lucene/makefile.mk
+++ b/lucene/makefile.mk
@@ -62,6 +62,8 @@ PATCH_FILES=lucene.patch
 PATCH_FILES+= long_path.patch
 .ENDIF
 
+PATCH_FILES+=lucene-java-version.patch
+
 BUILD_DIR=.
 BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml