Author: jim
Date: Thu Feb 14 14:25:20 2019
New Revision: 1853582
URL: http://svn.apache.org/viewvc?rev=1853582&view=rev
Log:
Merge r1852197 from trunk:
Fix building with Java 9, which doesn't support "-source 1.5" any more.
Our baseline is Java 7 anyway.
Patch by: me
Submitted by: damjan
Reviewed by: jim
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/qadevOOo/makefile.mk
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 14 14:25:20 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852430,1852438,1852623-1852624,1852841,1853175,1853319,1853443-1853444,1853504
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1853175,1853319,1853443-1853444,1853504
Modified: openoffice/branches/AOO42X/main/qadevOOo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/qadevOOo/makefile.mk?rev=1853582&r1=1853581&r2=1853582&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/qadevOOo/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/qadevOOo/makefile.mk Thu Feb 14 14:25:20
2019
@@ -37,7 +37,7 @@ TST:
.IF "$(SOLAR_JAVA)"=="TRUE"
.IF "$(ANT_HOME)"!="NO_ANT_HOME"
-ANT_FLAGS+=-Dbuild.source=1.5
+ANT_FLAGS+=-Dbuild.source=1.6
.IF "$(L10N_framework)"==""
ALLTAR: ANTBUILD
.ENDIF
