changeset 36:668144e3572b

CHange copyright year and version. Minor file formatting.
author bkurotsu
date Thu, 05 Mar 2015 15:59:37 -0700
parents 5ca3e20ebb66
children 524948ae52c4
files build/build-i18ncheck.xml build/build.properties
diffstat 2 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/build/build-i18ncheck.xml	Thu Mar 05 15:48:36 2015 -0700
+++ b/build/build-i18ncheck.xml	Thu Mar 05 15:59:37 2015 -0700
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!--
     $Id$
-    
-  Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+
+  Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- 
+
   This code is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License version 2 only, as
   published by the Free Software Foundation.  Oracle designates this
   particular file as subject to the "Classpath" exception as provided
   by Oracle in the LICENSE file that accompanied this code.
- 
+
   This code is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   version 2 for more details (a copy is included in the LICENSE file that
   accompanied this code).
- 
+
   You should have received a copy of the GNU General Public License version
   2 along with this work; if not, write to the Free Software Foundation,
   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- 
+
   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   or visit www.oracle.com if you need additional information or have any
   questions.
@@ -29,9 +29,9 @@
 
     <patternset id="i18ntest.packages">
 	<include name="com/sun/jct/utils/i18ncheck/**"/>
-	<exclude name="com/sun/jct/utils/i18ncheck/I18NVisitor15.java"/>	
+	<exclude name="com/sun/jct/utils/i18ncheck/I18NVisitor15.java"/>
 	<exclude name="com/sun/jct/utils/i18ncheck/I18NVisitor16.java"/>
-    </patternset>	
+    </patternset>
 
     <target name="test-i18n" depends="test-i18n-static" description="Runs i18n checking on all JT Harness src"/>
     <target name="test-i18n-static" depends="test-i18n-dynamic">
@@ -65,7 +65,7 @@
         </java>
     </target>
     <target name="test-i18n-dynamic" depends="compile.test.i18n, build-examples">
-        <copy file="${exam.dir}/tutorial/simpleTags/demots/lib/demots.jti" 
+        <copy file="${exam.dir}/tutorial/simpleTags/demots/lib/demots.jti"
                                                 todir="${build.tmp}"/>
         <java classname="${test.i18n.dynamic.class}" fork="true">
             <classpath>
@@ -73,7 +73,7 @@
             </classpath>
             <arg value="${build.tmp}/i18ncheck"/>
             <arg value="${BUILD_DIR}/classes/"/>
-            <arg value="${BUILD_DIR}/binaries/lib/jh.jar"/>            
+            <arg value="${BUILD_DIR}/binaries/lib/jh.jar"/>
             <arg value="${BUILD_DIR}/binaries/examples/tutorial/demots"/>
             <arg value="${build.tmp}/demots_wd"/>
             <arg value="${build.tmp}/demots.jti"/>
@@ -81,14 +81,14 @@
 	    <arg value="${build.tmp}/services_wd"/>
         </java>
     </target>
-    
-    
+
+
     <condition property="jdk6.available">
 	<contains string="${java.version}" substring="1.6"/>
-    </condition>    
+    </condition>
     <target name="compile.test.i18n" depends="visitor15.compile, visitor16.compile, dist">
 	<mkdir dir="${build.classes}"/>
-	
+
 	<javac encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
             srcdir="${test.dir}"
             destdir="${build.classes}"
@@ -97,16 +97,16 @@
         </javac>
     </target>
     <target name="visitor15.compile" unless="jdk6.available">
-	<mkdir dir="${build.classes}"/>    
+	<mkdir dir="${build.classes}"/>
 	<javac encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
             srcdir="${test.dir}"
             destdir="${build.classes}"
             classpath="${jdk14.classpath}">
 	    <include name="com/sun/jct/utils/i18ncheck/I18NVisitor15.java"/>
-        </javac>    
+        </javac>
     </target>
     <target name="visitor16.compile" if="jdk6.available">
-	<mkdir dir="${build.classes}"/>    
+	<mkdir dir="${build.classes}"/>
 	<javac encoding="iso-8859-1" debug="true" target="1.5" source="1.5"
             srcdir="${test.dir}"
             destdir="${build.classes}"
--- a/build/build.properties	Thu Mar 05 15:48:36 2015 -0700
+++ b/build/build.properties	Thu Mar 05 15:59:37 2015 -0700
@@ -25,7 +25,7 @@
 # questions.
 #
 
-build.version = 4.6
+build.version = 5.0
 build.milestone = dev
 build.number = b00
 
@@ -49,8 +49,8 @@
 javadoc.splitindex = true
 javadoc.use = true
 javadoc.version = false
-javadoc.windowtitle = JT Harness Version 4.6
-javadoc.footer = Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+javadoc.windowtitle = JT Harness Version 5.0
+javadoc.footer = Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
 
 run.class = com.sun.javatest.tool.Main
 jdk14.classpath = ${jhalljar}:${servletjar}