mirror of https://github.com/apache/poi.git
Allow one more add-opens to silence one more warning seen in Java 9/Java 10 currently
Use latest JDK 10 versions git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1830551 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
12d8a85ca9
commit
f2ad373bf4
|
@ -317,6 +317,7 @@ under the License.
|
||||||
<property name="java9addopens3" value="-Dthis.is.a.dummy=true"/>
|
<property name="java9addopens3" value="-Dthis.is.a.dummy=true"/>
|
||||||
<property name="java9addopens4" value="-Dthis.is.a.dummy=true"/>
|
<property name="java9addopens4" value="-Dthis.is.a.dummy=true"/>
|
||||||
<property name="java9addopens5" value="-Dthis.is.a.dummy=true"/>
|
<property name="java9addopens5" value="-Dthis.is.a.dummy=true"/>
|
||||||
|
<property name="java9addopens6" value="-Dthis.is.a.dummy=true"/>
|
||||||
|
|
||||||
<path id="main.classpath">
|
<path id="main.classpath">
|
||||||
<pathelement location="${main.commons-logging.jar}"/>
|
<pathelement location="${main.commons-logging.jar}"/>
|
||||||
|
@ -1308,6 +1309,7 @@ under the License.
|
||||||
<jvmarg value="${java9addopens3}" />
|
<jvmarg value="${java9addopens3}" />
|
||||||
<jvmarg value="${java9addopens4}" />
|
<jvmarg value="${java9addopens4}" />
|
||||||
<jvmarg value="${java9addopens5}" />
|
<jvmarg value="${java9addopens5}" />
|
||||||
|
<jvmarg value="${java9addopens6}" />
|
||||||
<jvmarg value="${file.leak.detector}" />
|
<jvmarg value="${file.leak.detector}" />
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
|
@ -1380,6 +1382,7 @@ under the License.
|
||||||
<jvmarg value="${java9addopens3}" />
|
<jvmarg value="${java9addopens3}" />
|
||||||
<jvmarg value="${java9addopens4}" />
|
<jvmarg value="${java9addopens4}" />
|
||||||
<jvmarg value="${java9addopens5}" />
|
<jvmarg value="${java9addopens5}" />
|
||||||
|
<jvmarg value="${java9addopens6}" />
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
<batchtest todir="${scratchpad.reports.test}">
|
<batchtest todir="${scratchpad.reports.test}">
|
||||||
|
@ -1430,6 +1433,7 @@ under the License.
|
||||||
<jvmarg value="${java9addopens3}" />
|
<jvmarg value="${java9addopens3}" />
|
||||||
<jvmarg value="${java9addopens4}" />
|
<jvmarg value="${java9addopens4}" />
|
||||||
<jvmarg value="${java9addopens5}" />
|
<jvmarg value="${java9addopens5}" />
|
||||||
|
<jvmarg value="${java9addopens6}" />
|
||||||
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
||||||
<jvmarg value="${file.leak.detector}" />
|
<jvmarg value="${file.leak.detector}" />
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
|
@ -1465,6 +1469,7 @@ under the License.
|
||||||
<jvmarg value="${java9addopens3}" />
|
<jvmarg value="${java9addopens3}" />
|
||||||
<jvmarg value="${java9addopens4}" />
|
<jvmarg value="${java9addopens4}" />
|
||||||
<jvmarg value="${java9addopens5}" />
|
<jvmarg value="${java9addopens5}" />
|
||||||
|
<jvmarg value="${java9addopens6}" />
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
<batchtest todir="${ooxml.reports.test}">
|
<batchtest todir="${ooxml.reports.test}">
|
||||||
|
@ -1514,6 +1519,7 @@ under the License.
|
||||||
<jvmarg value="${java9addopens3}" />
|
<jvmarg value="${java9addopens3}" />
|
||||||
<jvmarg value="${java9addopens4}" />
|
<jvmarg value="${java9addopens4}" />
|
||||||
<jvmarg value="${java9addopens5}" />
|
<jvmarg value="${java9addopens5}" />
|
||||||
|
<jvmarg value="${java9addopens6}" />
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
<batchtest todir="${integration.reports.test}">
|
<batchtest todir="${integration.reports.test}">
|
||||||
|
@ -1573,6 +1579,7 @@ under the License.
|
||||||
<jvmarg value="${java9addopens3}" />
|
<jvmarg value="${java9addopens3}" />
|
||||||
<jvmarg value="${java9addopens4}" />
|
<jvmarg value="${java9addopens4}" />
|
||||||
<jvmarg value="${java9addopens5}" />
|
<jvmarg value="${java9addopens5}" />
|
||||||
|
<jvmarg value="${java9addopens6}" />
|
||||||
<jvmarg value="${file.leak.detector}" />
|
<jvmarg value="${file.leak.detector}" />
|
||||||
<arg value="-ooxml"/>
|
<arg value="-ooxml"/>
|
||||||
<arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
|
<arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
|
||||||
|
@ -1619,6 +1626,7 @@ under the License.
|
||||||
<jvmarg value="${java9addopens3}" />
|
<jvmarg value="${java9addopens3}" />
|
||||||
<jvmarg value="${java9addopens4}" />
|
<jvmarg value="${java9addopens4}" />
|
||||||
<jvmarg value="${java9addopens5}" />
|
<jvmarg value="${java9addopens5}" />
|
||||||
|
<jvmarg value="${java9addopens6}" />
|
||||||
<jvmarg value="${file.leak.detector}" />
|
<jvmarg value="${file.leak.detector}" />
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
|
|
|
@ -34,6 +34,7 @@ def poijobs = [
|
||||||
'-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
|
'-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
|
||||||
'-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
|
'-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
|
||||||
'-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
|
'-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
|
||||||
|
'-Djava9addopens6=--add-opens=java.base/java.lang=java.xml.bind',
|
||||||
'-Djava.locale.providers=JRE,CLDR'],
|
'-Djava.locale.providers=JRE,CLDR'],
|
||||||
skipcigame: true
|
skipcigame: true
|
||||||
],
|
],
|
||||||
|
@ -46,6 +47,7 @@ def poijobs = [
|
||||||
'-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
|
'-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
|
||||||
'-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
|
'-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
|
||||||
'-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
|
'-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
|
||||||
|
'-Djava9addopens6=--add-opens=java.base/java.lang=java.xml.bind',
|
||||||
'-Djava.locale.providers=JRE,CLDR'],
|
'-Djava.locale.providers=JRE,CLDR'],
|
||||||
skipcigame: true
|
skipcigame: true
|
||||||
],
|
],
|
||||||
|
@ -90,7 +92,8 @@ def defaultSlaves = 'ubuntu&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4&&!H
|
||||||
def jdkMapping = [
|
def jdkMapping = [
|
||||||
'1.8': 'JDK 1.8 (latest)',
|
'1.8': 'JDK 1.8 (latest)',
|
||||||
'1.9': 'JDK 1.9 (latest)',
|
'1.9': 'JDK 1.9 (latest)',
|
||||||
'1.10': 'JDK 10 b36 (early access build)',
|
'1.10': 'JDK 10 (latest)',
|
||||||
|
'1.11': 'JDK 11 b8 (early access build)',
|
||||||
'OpenJDK': 'OpenJDK 8 (on Ubuntu only) ', // blank is required here until the name in the Jenkins instance is fixed!
|
'OpenJDK': 'OpenJDK 8 (on Ubuntu only) ', // blank is required here until the name in the Jenkins instance is fixed!
|
||||||
'IBMJDK': 'IBM 1.8 64-bit (on Ubuntu only)',
|
'IBMJDK': 'IBM 1.8 64-bit (on Ubuntu only)',
|
||||||
]
|
]
|
||||||
|
@ -434,8 +437,10 @@ Unfortunately we often see builds break because of changes/new machines...'''
|
||||||
'JDK 9 b181',
|
'JDK 9 b181',
|
||||||
'JDK 9 b181 (unlimited security)',
|
'JDK 9 b181 (unlimited security)',
|
||||||
|
|
||||||
'JDK 10 b36 (early access build)',
|
'JDK 10 (latest)',
|
||||||
'JDK 10 b37 (early access build) (Windows Only)'
|
'JDK 10 b46 (Windows Only)',
|
||||||
|
|
||||||
|
'JDK 11 b8 (early access build)'
|
||||||
)
|
)
|
||||||
label('Nodes',
|
label('Nodes',
|
||||||
'beam1','beam2','beam3','beam4','beam5','beam6','beam7','beam8',
|
'beam1','beam2','beam3','beam4','beam5','beam6','beam7','beam8',
|
||||||
|
|
|
@ -65,9 +65,9 @@ public class TestXSLFSimpleShape {
|
||||||
assertFalse(getSpPr(shape).isSetLn());
|
assertFalse(getSpPr(shape).isSetLn());
|
||||||
|
|
||||||
assertEquals(0., shape.getLineWidth(), 0);
|
assertEquals(0., shape.getLineWidth(), 0);
|
||||||
assertEquals(null, shape.getLineColor());
|
assertNull(shape.getLineColor());
|
||||||
assertEquals(null, shape.getLineDash());
|
assertNull(shape.getLineDash());
|
||||||
assertEquals(null, shape.getLineCap());
|
assertNull(shape.getLineCap());
|
||||||
|
|
||||||
shape.setLineWidth(0);
|
shape.setLineWidth(0);
|
||||||
shape.setLineColor(null);
|
shape.setLineColor(null);
|
||||||
|
@ -125,7 +125,7 @@ public class TestXSLFSimpleShape {
|
||||||
assertEquals(Color.BLUE, shape.getLineColor());
|
assertEquals(Color.BLUE, shape.getLineColor());
|
||||||
assertTrue(getSpPr(shape).getLn().isSetSolidFill());
|
assertTrue(getSpPr(shape).getLn().isSetSolidFill());
|
||||||
shape.setLineColor(null);
|
shape.setLineColor(null);
|
||||||
assertEquals(null, shape.getLineColor());
|
assertNull(shape.getLineColor());
|
||||||
// setting dash width to null unsets the SolidFill element
|
// setting dash width to null unsets the SolidFill element
|
||||||
assertFalse(getSpPr(shape).getLn().isSetSolidFill());
|
assertFalse(getSpPr(shape).getLn().isSetSolidFill());
|
||||||
|
|
||||||
|
@ -139,9 +139,9 @@ public class TestXSLFSimpleShape {
|
||||||
ln3.setLineWidth(1.);
|
ln3.setLineWidth(1.);
|
||||||
assertEquals(1., ln3.getLineWidth(), 0);
|
assertEquals(1., ln3.getLineWidth(), 0);
|
||||||
ln3.setLineDash(null);
|
ln3.setLineDash(null);
|
||||||
assertEquals(null, ln3.getLineDash());
|
assertNull(ln3.getLineDash());
|
||||||
ln3.setLineCap(null);
|
ln3.setLineCap(null);
|
||||||
assertEquals(null, ln3.getLineDash());
|
assertNull(ln3.getLineDash());
|
||||||
|
|
||||||
ppt.close();
|
ppt.close();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue