svn commit: r1727680 - /db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java

[rh...@apache.org]

Author: rhillegas
Date: Sat Jan 30 05:44:19 2016
New Revision: 1727680

URL: http://svn.apache.org/viewvc?rev=1727680&view=rev
Log:
DERBY-6857: Make classlister prune the constants files from the rosters of jar file contents; commit derby-6857-04-aa-pruneConstantClasses.diff.

Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java?rev=1727680&r1=1727679&r2=1727680&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java Sat Jan 30 05:44:19 2016
@@ -511,6 +511,22 @@ public class classlister {
 			}
 		}
 
+    //
+    // Exclude classes which are referenced only by the compiler
+    // in order to copy constants into the target class. These were not recorded
+    // in the constant pool by Java compilers at level 7 or earlier.
+    // However, these started turning up under Windows with Java 8
+    // after the base compilation level was changed to Java 8 by the work
+    // on https://issues.apache.org/jira/browse/DERBY-6857. See that issue
+    // for more information.
+    //
+    if (
+        className.startsWith("org.apache.derby.iapi.reference.DRDAConstants") ||
+        className.startsWith("org.apache.derby.shared.common.sanity.SanityState") ||
+        className.startsWith("org.apache.derbyPreBuild.ReleaseProperties")
+        )
+    { return; }
+
 		// already seen class
 		if (foundClasses.get(className) != null)
 			return;