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 2018/09/27 00:16:28 UTC
svn commit: r1842064 - in /db/derby/code/trunk/java:
build/org/apache/derbyBuild/lastgoodjarcontents/
org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/
Author: rhillegas
Date: Thu Sep 27 00:16:28 2018
New Revision: 1842064
URL: http://svn.apache.org/viewvc?rev=1842064&view=rev
Log:
DERBY-6998: Re-enable encryption tests when running on Java 11; tests passed cleanly on derby-6998-03-aa-reenableEncryptionTestsOnJDK11.diff.
Added:
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java
- copied, changed from r1842021, db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk100.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk111.java
- copied, changed from r1842021, db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java
Removed:
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk100.java
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
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=1842064&r1=1842063&r2=1842064&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 Thu Sep 27 00:16:28 2018
@@ -41,8 +41,8 @@ org.apache.derbyTesting.functionTests.ha
org.apache.derbyTesting.functionTests.harness.j9_foundation.class
org.apache.derbyTesting.functionTests.harness.j9_foundation11.class
org.apache.derbyTesting.functionTests.harness.j9dee15.class
-org.apache.derbyTesting.functionTests.harness.jdk100.class
org.apache.derbyTesting.functionTests.harness.jdk110.class
+org.apache.derbyTesting.functionTests.harness.jdk111.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=1842064&r1=1842063&r2=1842064&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 Thu Sep 27 00:16:28 2018
@@ -41,8 +41,8 @@ org.apache.derbyTesting.functionTests.ha
org.apache.derbyTesting.functionTests.harness.j9_foundation.class
org.apache.derbyTesting.functionTests.harness.j9_foundation11.class
org.apache.derbyTesting.functionTests.harness.j9dee15.class
-org.apache.derbyTesting.functionTests.harness.jdk100.class
org.apache.derbyTesting.functionTests.harness.jdk110.class
+org.apache.derbyTesting.functionTests.harness.jdk111.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=1842064&r1=1842063&r2=1842064&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 Thu Sep 27 00:16:28 2018
@@ -47,13 +47,13 @@ public class JavaVersionHolder
// handle JDK 10
if (javaVersion.equals( "10" ))
{
- javaVersion = "10.0.1";
+ javaVersion = "1.10.0";
}
// handle JDK 11
if (javaVersion.startsWith( "11" ))
{
- javaVersion = "11.0.1";
+ javaVersion = "1.11.0";
}
// check for jdk12 or higher
Copied: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java (from r1842021, db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk100.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java?p2=db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java&p1=db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk100.java&r1=1842021&r2=1842064&rev=1842064&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk100.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java Thu Sep 27 00:16:28 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derbyTesting.functionTests.harness.jdk100
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk110
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -26,25 +26,25 @@ import java.util.StringTokenizer;
import org.apache.derby.shared.common.info.JVMInfo;
-public class jdk100 extends jvm {
+public class jdk110 extends jvm {
- public String getName(){return "jdk100";}
- public jdk100(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ public String getName(){return "jdk110";}
+ public jdk110(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 jdk100(String classpath, Vector<String> D) {
+ public jdk110(String classpath, Vector<String> D) {
super(classpath,D);
}
- public jdk100(long ms, long mx, String classpath, Vector<String> D) {
+ public jdk110(long ms, long mx, String classpath, Vector<String> D) {
super(ms,mx,classpath,D);
}
- public jdk100() { }
+ public jdk110() { }
public Vector<String> getCommandLine() {
@@ -84,7 +84,7 @@ public class jdk100 extends jvm {
}
if (prof!=null) warn(getName() + " does not support prof");
if (verify) warn(getName() + " does not support verify");
- if (noverify) warn("jdk100 does not support noverify");
+ if (noverify) warn("jdk110 does not support noverify");
if (nojit) sb.append(" -Djava.compiler=NONE");
if (D != null)
for (int i=0; i<D.size();i++) {
Copied: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk111.java (from r1842021, db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk111.java?p2=db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk111.java&p1=db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java&r1=1842021&r2=1842064&rev=1842064&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk111.java Thu Sep 27 00:16:28 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derbyTesting.functionTests.harness.jdk110
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk111
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -25,23 +25,23 @@ import java.util.Vector;
import java.util.StringTokenizer;
-public class jdk110 extends jdk100
+public class jdk111 extends jdk110
{
- public String getName(){return "jdk110";}
- public jdk110(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+ public String getName(){return "jdk111";}
+ public jdk111(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 jdk110(String classpath, Vector<String> D) {
+ public jdk111(String classpath, Vector<String> D) {
super(classpath,D);
}
- public jdk110(long ms, long mx, String classpath, Vector<String> D) {
+ public jdk111(long ms, long mx, String classpath, Vector<String> D) {
super(ms,mx,classpath,D);
}
- public jdk110() { super(); }
+ public jdk111() { super(); }
}