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/06/02 14:15:43 UTC
svn commit: r1832736 - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/lastgoodjarcontents/
java/engine/org/apache/derby/iapi/types/
java/testing/org/apache/derbyTesting/functionTests/harness/
Author: rhillegas
Date: Sat Jun 2 14:15:43 2018
New Revision: 1832736
URL: http://svn.apache.org/viewvc?rev=1832736&view=rev
Log:
DERBY-6998: Fix compilation warning when building with JDK 10; commit derby-6998-01-ab-tightenReturnType.diff.
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk100.java (with props)
Modified:
db/derby/code/trunk/build.xml
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/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1832736&r1=1832735&r2=1832736&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Sat Jun 2 14:15:43 2018
@@ -44,7 +44,7 @@
</not>
</condition>
-<echoproperties/>
+<!-- <echoproperties/> -->
<!-- Targets -->
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=1832736&r1=1832735&r2=1832736&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 Sat Jun 2 14:15:43 2018
@@ -39,6 +39,7 @@ 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.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=1832736&r1=1832735&r2=1832736&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 Sat Jun 2 14:15:43 2018
@@ -39,6 +39,7 @@ 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.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.derbytools.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents?rev=1832736&r1=1832735&r2=1832736&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents Sat Jun 2 14:15:43 2018
@@ -81,7 +81,6 @@ org.apache.derby.jdbc.EmbeddedDriver.cla
org.apache.derby.jdbc.EmbeddedXADataSource.class
org.apache.derby.jdbc.EmbeddedXADataSource40.class
org.apache.derby.jdbc.ReferenceableDataSource.class
-org.apache.derby.loc.tools.toolsmessagesProviderImpl.class
org.apache.derby.tools.JDBCDisplayUtil.class
org.apache.derby.tools.PlanExporter.class
org.apache.derby.tools.SignatureChecker.class
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java?rev=1832736&r1=1832735&r2=1832736&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java Sat Jun 2 14:15:43 2018
@@ -725,8 +725,9 @@ public class SqlXmlUtil
}
@Override
- public Iterator getPrefixes(String namespaceURI) {
- return Collections.emptyList().iterator();
+ public Iterator<String> getPrefixes(String namespaceURI) {
+ List<String> emptylist = Collections.emptyList();
+ return emptylist.iterator();
}
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java?rev=1832736&r1=1832735&r2=1832736&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java Sat Jun 2 14:15:43 2018
@@ -44,6 +44,12 @@ public class JavaVersionHolder
javaVersion = "1.9.0";
}
+ // handle JDK 10
+ if (javaVersion.equals( "10" ))
+ {
+ javaVersion = "10.0.1";
+ }
+
// check for jdk12 or higher
int i = javaVersion.indexOf('.');
int j = javaVersion.indexOf('.', i+1);
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk100.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk100.java?rev=1832736&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk100.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk100.java Sat Jun 2 14:15:43 2018
@@ -0,0 +1,90 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.harness.jdk100
+
+ 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 jdk100 extends jvm {
+
+ public String getName(){return "jdk100";}
+ public jdk100(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) {
+ super(classpath,D);
+ }
+
+ public jdk100(long ms, long mx, String classpath, Vector<String> D) {
+ super(ms,mx,classpath,D);
+ }
+
+ public jdk100() { }
+
+
+ public Vector<String> getCommandLine() {
+ StringBuffer sb = new StringBuffer();
+ Vector<String> v = super.getCommandLine();
+ appendOtherFlags(sb);
+ String s = sb.toString();
+ StringTokenizer st = new StringTokenizer(s);
+ while (st.hasMoreTokens()) {
+ v.addElement(st.nextToken());
+ }
+ return v;
+ }
+
+ public void appendOtherFlags(StringBuffer sb) {
+ if (noasyncgc) warn("jdk100 does not support noasyncgc");
+ if (verbosegc) sb.append(" -verbose:gc");
+ if (noclassgc) sb.append(" -Xnoclassgc");
+ if (ss>=0) warn("jdk100 does not support ss");
+ if (oss>=0) warn("jdk100 does not support oss");
+ if (ms>=0) {
+ sb.append(" -ms");
+ sb.append(ms);
+ }
+ if (mx>=0) {
+ sb.append(" -mx");
+ sb.append(mx);
+ }
+ if (classpath!=null) {
+ sb.append(" -classpath ");
+ sb.append(classpath);
+ }
+ if (prof!=null) warn("jdk100 does not support prof");
+ if (verify) warn("jdk100 does not support verify");
+ if (noverify) warn("jdk100 does not support noverify");
+ if (nojit) sb.append(" -Djava.compiler=NONE");
+ if (D != null)
+ for (int i=0; i<D.size();i++) {
+ sb.append(" -D");
+ sb.append((String)(D.elementAt(i)));
+ }
+ }
+ public String getDintro() { return "-D"; }
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk100.java
------------------------------------------------------------------------------
svn:eol-style = native