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 2016/01/24 19:49:47 UTC
svn commit: r1726535 - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/ tools/ant/properties/ tools/l10n/
tools/release/notices/ tools/release/templates/
Author: rhillegas
Date: Sun Jan 24 18:49:47 2016
New Revision: 1726535
URL: http://svn.apache.org/viewvc?rev=1726535&view=rev
Log:
DERBY-6857: Remove references to jsr 169 from the build machinery; commit derby-6857-02-aa-cleanupOldJdks.diff.
Removed:
db/derby/code/trunk/tools/ant/properties/compilepath.properties
Modified:
db/derby/code/trunk/NOTICE
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
db/derby/code/trunk/releaseSummary.xml
db/derby/code/trunk/tools/ant/properties/dirs.properties
db/derby/code/trunk/tools/ant/properties/release.properties
db/derby/code/trunk/tools/l10n/build.xml
db/derby/code/trunk/tools/release/notices/jdbcstubs.txt
db/derby/code/trunk/tools/release/templates/releaseSummaryTemplate.xml
Modified: db/derby/code/trunk/NOTICE
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/NOTICE?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/NOTICE (original)
+++ db/derby/code/trunk/NOTICE Sun Jan 24 18:49:47 2016
@@ -45,10 +45,8 @@ http://www.itl.nist.gov/div897/ctg/sql_f
=========================================================================
-The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and
-java/stubs/jdbc3) were produced by trimming sources supplied by the
-Apache Harmony project. In addition, the Harmony SerialBlob and
-SerialClob implementations are used. The following notice covers the Harmony sources:
+Derby uses the SerialBlob and SerialClob implementations from the Apache
+Harmony project. The following notice covers the Harmony sources:
Portions of Harmony were originally developed by
Intel Corporation and are licensed to the Apache Software
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Sun Jan 24 18:49:47 2016
@@ -285,10 +285,6 @@
<!-- Release and version info -->
<property file="${properties.dir}/release.properties"/>
- <!--
- The lowest common denominator compile path for Derby. We expect that
- the bulk of the Derby product will run on Java SE 6.
- -->
<property name="compile.classpath" value="${java18compile.classpath}"/>
<property name="compilerPropsAlreadySet" value="true"/>
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java Sun Jan 24 18:49:47 2016
@@ -123,7 +123,6 @@ public class ReleaseNotesGenerator exten
private static final String COMPILER_HEADLINE = "Compiler";
private static final String JAVA6_HEADLINE = "Java 6";
private static final String JDK14_HEADLINE = "JDK 1.4";
- private static final String JSR169_HEADLINE = "JSR 169";
private static final String MACHINE_HEADLINE = "Machine";
private static final String OSGI_HEADLINE = "OSGi";
@@ -132,7 +131,6 @@ public class ReleaseNotesGenerator exten
private static final String SUM_COMPILER = "compilers";
private static final String SUM_JAVA6 = "java6";
private static final String SUM_JDK14 = "jdk1.4";
- private static final String SUM_JSR169 = "jsr169";
private static final String SUM_MACHINE = "machine";
private static final String SUM_NEW_FEATURES = "newFeatures";
private static final String SUM_OSGI = "osgi";
@@ -440,9 +438,6 @@ public class ReleaseNotesGenerator exten
addHeadlinedItem(list, COMPILER_HEADLINE,
summary.getTextByTagName(SUM_COMPILER));
-
- addHeadlinedItem(list, JSR169_HEADLINE,
- summary.getTextByTagName(SUM_JSR169));
}
//////////////////////////////////
Modified: db/derby/code/trunk/releaseSummary.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/releaseSummary.xml?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/releaseSummary.xml (original)
+++ db/derby/code/trunk/releaseSummary.xml Sun Jan 24 18:49:47 2016
@@ -61,13 +61,6 @@ with real information.
-->
<compilers>All classes were compiled by the javac from the 1.8.0-b132 JDK, Java HotSpot(TM) 64-Bit Server VM (build 25.0-b70, mixed mode).</compilers>
- <!--
- Say here whether you built the Java ME support and, if so, which
- tookit you used.
- E.g.: Java ME support was built using java.sun.com/j2me (j2me_cdc_fp-1_0_2).
- -->
- <jsr169>Support for JSR 169 has been deprecated.</jsr169>
-
</buildInfo>
<overview>
Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Sun Jan 24 18:49:47 2016
@@ -48,9 +48,6 @@ jarsdist.dir=${out.base}/jars
metadata.out.dir=${out.dir}/org/apache/derby/impl/jdbc
out.stubs.dir=${out.dir}/stubs
-out.jsr169.dir=${out.stubs.dir}/jsr169
-out.jdbc3.dir=${out.stubs.dir}/jdbc3
-out.jdbc4.dir=${out.stubs.dir}/jdbc4
out.felix.dir=${out.stubs.dir}/felix
# An empty directory that we put in the boot classpath to prevent Ant
@@ -65,9 +62,6 @@ derby.dir=org/apache/derby
derbysrc.dir=${basedir}/java
derby.stubs.dir=${derbysrc.dir}/stubs
-derby.jsr169.src.dir=${derby.stubs.dir}/jsr169
-derby.jdbc3.src.dir=${derby.stubs.dir}/jdbc3
-derby.jdbc4.src.dir=${derby.stubs.dir}/jdbc4
derby.felix.src.dir=${derby.stubs.dir}/felix
derby.engine.src.dir=${derbysrc.dir}/engine
Modified: db/derby/code/trunk/tools/ant/properties/release.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/release.properties?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/release.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/release.properties Sun Jan 24 18:49:47 2016
@@ -20,7 +20,7 @@ major=10
minor=13
eversion=10.13
beta=true
-copyright.comment=Copyright 1997, 2015 The Apache Software Foundation or its licensors, as applicable.
+copyright.comment=Copyright 1997, 2016 The Apache Software Foundation or its licensors, as applicable.
vendor=The Apache Software Foundation
-copyright.year=2015
+copyright.year=2016
release.id.long=10.13.0.0 beta
Modified: db/derby/code/trunk/tools/l10n/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/l10n/build.xml?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/tools/l10n/build.xml (original)
+++ db/derby/code/trunk/tools/l10n/build.xml Sun Jan 24 18:49:47 2016
@@ -36,8 +36,8 @@
<target name="compile">
<javac
- source="1.6"
- target="1.6"
+ source="1.8"
+ target="1.8"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -50,7 +50,7 @@
destdir="${out.dir}"
includes="LocCompare*">
<classpath>
- <pathelement path="${java14compile.classpath}"/>
+ <pathelement path="${java18compile.classpath}"/>
</classpath>
<compilerarg value="-Xlint:unchecked"/>
</javac>
Modified: db/derby/code/trunk/tools/release/notices/jdbcstubs.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/jdbcstubs.txt?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/notices/jdbcstubs.txt (original)
+++ db/derby/code/trunk/tools/release/notices/jdbcstubs.txt Sun Jan 24 18:49:47 2016
@@ -1,8 +1,6 @@
-The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and
-java/stubs/jdbc3) were produced by trimming sources supplied by the
-Apache Harmony project. In addition, the Harmony SerialBlob and
-SerialClob implementations are used. The following notice covers the Harmony sources:
+Derby uses the SerialBlob and SerialClob implementations from the Apache
+Harmony project. The following notice covers the Harmony sources:
Portions of Harmony were originally developed by
Intel Corporation and are licensed to the Apache Software
Modified: db/derby/code/trunk/tools/release/templates/releaseSummaryTemplate.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/templates/releaseSummaryTemplate.xml?rev=1726535&r1=1726534&r2=1726535&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/templates/releaseSummaryTemplate.xml (original)
+++ db/derby/code/trunk/tools/release/templates/releaseSummaryTemplate.xml Sun Jan 24 18:49:47 2016
@@ -78,13 +78,6 @@ with real information.
-->
<compilers>???</compilers>
- <!--
- Say here whether you built the J2ME support and, if so, which
- tookit you used.
- E.g.: J2ME support was built using java.sun.com/j2me (j2me_cdc_fp-1_0_2).
- -->
- <jsr169>???</jsr169>
-
</buildInfo>
<!--