You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2020/10/21 15:28:13 UTC
svn commit: r1882733 - in /db/derby/code/trunk/java:
build/org/apache/derbyBuild/lastgoodjarcontents/
org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/
org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/
org.apache....
Author: rhillegas
Date: Wed Oct 21 15:28:12 2020
New Revision: 1882733
URL: http://svn.apache.org/viewvc?rev=1882733&view=rev
Log:
DERBY-7087: Make tests run cleanly under JDK 15 against jars which were built with Java 9; commit derby-7087-01-aa-runOnJDK15.diff.
Added:
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk112.java (with props)
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk113.java (with props)
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk114.java (with props)
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk115.java (with props)
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk116.java (with props)
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk117.java (with props)
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk118.java (with props)
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk119.java (with props)
Modified:
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/derbyall.properties
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents?rev=1882733&r1=1882732&r2=1882733&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents Wed Oct 21 15:28:12 2020
@@ -43,6 +43,14 @@ org.apache.derbyTesting.functionTests.ha
org.apache.derbyTesting.functionTests.harness.j9dee15.class
org.apache.derbyTesting.functionTests.harness.jdk110.class
org.apache.derbyTesting.functionTests.harness.jdk111.class
+org.apache.derbyTesting.functionTests.harness.jdk112.class
+org.apache.derbyTesting.functionTests.harness.jdk113.class
+org.apache.derbyTesting.functionTests.harness.jdk114.class
+org.apache.derbyTesting.functionTests.harness.jdk115.class
+org.apache.derbyTesting.functionTests.harness.jdk116.class
+org.apache.derbyTesting.functionTests.harness.jdk117.class
+org.apache.derbyTesting.functionTests.harness.jdk118.class
+org.apache.derbyTesting.functionTests.harness.jdk119.class
org.apache.derbyTesting.functionTests.harness.jdk13.class
org.apache.derbyTesting.functionTests.harness.jdk14.class
org.apache.derbyTesting.functionTests.harness.jdk15.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents?rev=1882733&r1=1882732&r2=1882733&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents Wed Oct 21 15:28:12 2020
@@ -43,6 +43,14 @@ org.apache.derbyTesting.functionTests.ha
org.apache.derbyTesting.functionTests.harness.j9dee15.class
org.apache.derbyTesting.functionTests.harness.jdk110.class
org.apache.derbyTesting.functionTests.harness.jdk111.class
+org.apache.derbyTesting.functionTests.harness.jdk112.class
+org.apache.derbyTesting.functionTests.harness.jdk113.class
+org.apache.derbyTesting.functionTests.harness.jdk114.class
+org.apache.derbyTesting.functionTests.harness.jdk115.class
+org.apache.derbyTesting.functionTests.harness.jdk116.class
+org.apache.derbyTesting.functionTests.harness.jdk117.class
+org.apache.derbyTesting.functionTests.harness.jdk118.class
+org.apache.derbyTesting.functionTests.harness.jdk119.class
org.apache.derbyTesting.functionTests.harness.jdk13.class
org.apache.derbyTesting.functionTests.harness.jdk14.class
org.apache.derbyTesting.functionTests.harness.jdk15.class
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java?rev=1882733&r1=1882732&r2=1882733&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java Wed Oct 21 15:28:12 2020
@@ -44,18 +44,30 @@ public class JavaVersionHolder
javaVersion = "1.9.0";
}
- // handle JDK 10
- if (javaVersion.equals( "10" ))
- {
- javaVersion = "1.10.0";
- }
-
// handle JDK 11
if (javaVersion.startsWith( "11" ))
{
javaVersion = "1.11.0";
}
+ // handle future java versions
+ switch(javaVersion)
+ {
+ case "10":
+ case "13":
+ case "14":
+ case "15":
+ case "16":
+ case "17":
+ case "18":
+ case "19":
+ javaVersion = "1." + javaVersion + ".0";
+ break;
+
+ default:
+ break;
+ }
+
// check for jdk12 or higher
int i = javaVersion.indexOf('.');
int j = javaVersion.indexOf('.', i+1);
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk112.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk112.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk112.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk112.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk112
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk112 extends jdk110
+{
+ public String getName(){return "jdk112";}
+ public jdk112(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk112(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk112(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk112() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk112.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk113.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk113.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk113.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk113.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk113
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk113 extends jdk110
+{
+ public String getName(){return "jdk113";}
+ public jdk113(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk113(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk113(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk113() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk113.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk114.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk114.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk114.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk114.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk114
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk114 extends jdk110
+{
+ public String getName(){return "jdk114";}
+ public jdk114(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk114(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk114(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk114() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk114.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk115.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk115.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk115.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk115.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk115
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk115 extends jdk110
+{
+ public String getName(){return "jdk115";}
+ public jdk115(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk115(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk115(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk115() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk115.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk116.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk116.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk116.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk116.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk116
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk116 extends jdk110
+{
+ public String getName(){return "jdk116";}
+ public jdk116(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk116(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk116(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk116() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk116.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk117.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk117.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk117.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk117.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk117
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk117 extends jdk110
+{
+ public String getName(){return "jdk117";}
+ public jdk117(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk117(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk117(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk117() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk117.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk118.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk118.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk118.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk118.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk118
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk118 extends jdk110
+{
+ public String getName(){return "jdk118";}
+ public jdk118(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk118(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk118(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk118() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk118.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk119.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk119.java?rev=1882733&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk119.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk119.java Wed Oct 21 15:28:12 2020
@@ -0,0 +1,47 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk119
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk119 extends jdk110
+{
+ public String getName(){return "jdk119";}
+ public jdk119(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ long ss, long oss, long ms, long mx, String classpath, String prof,
+ boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
+ super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+ verify,noverify,nojit,D);
+ }
+
+ public jdk119(String classpath, Vector<String> D) {
+ super(classpath,D);
+ }
+
+ public jdk119(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk119() { super(); }
+}
Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk119.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/derbyall.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/derbyall.properties?rev=1882733&r1=1882732&r2=1882733&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/derbyall.properties (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/derbyall.properties Wed Oct 21 15:28:12 2020
@@ -13,6 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-suites=derbylang storeall xa derbytools derbynetclientmats encryptionAll unit
+# exclude tests which use SSL because of JDK bug https://bugs.openjdk.java.net/browse/JDK-8211426
+# see https://issues.apache.org/jira/browse/DERBY-6998
+#suites=derbylang storeall xa derbytools derbynetclientmats encryptionAll unit
+
+suites=derbylang storeall xa derbytools encryptionAll unit
derby.debug.true=enableBtreeConsistencyCheck
derby.stream.error.logSeverityLevel=0
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java?rev=1882733&r1=1882732&r2=1882733&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java Wed Oct 21 15:28:12 2020
@@ -64,7 +64,14 @@ public class SSLTest extends BaseJDBCTes
// Need derbynet.jar in the classpath!
if (!Derby.hasServer())
+ {
return suite;
+ }
+
+ // SSL as used by these tests was broken by JDK 10.
+ // See https://issues.apache.org/jira/browse/DERBY-6998
+ // and https://bugs.openjdk.java.net/browse/JDK-8211426.
+ if (vmAtLeast(1, 10)) { return suite; }
suite.addTest(decorateTest("testSSLBasicDSConnect"));
suite.addTest(decorateTest("testSSLBasicDSPlainConnect"));