# HG changeset patch
# User ohair
# Date 1302658557 25200
# Node ID fc47c97bbbd91b1f774d855c48a7e285eb1a351a
# Parent  574b71659cb101e7ba7675cccff719b2ee8c1b80# Parent  7e13dbf7e8af65aa4cdedd232f94e69d66614251
Merge

diff -r 574b71659cb1 -r fc47c97bbbd9 Makefile
--- a/Makefile	Sun Apr 10 10:17:36 2011 -0700
+++ b/Makefile	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/Defs-internal.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/corba-rules.gmk
--- a/make/corba-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/corba-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/deploy-rules.gmk
--- a/make/deploy-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/deploy-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/hotspot-rules.gmk
--- a/make/hotspot-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/hotspot-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/install-rules.gmk
--- a/make/install-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/install-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/jaxp-rules.gmk
--- a/make/jaxp-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/jaxp-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/jaxws-rules.gmk
--- a/make/jaxws-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/jaxws-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/jdk-rules.gmk
--- a/make/jdk-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/jdk-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/langtools-rules.gmk
--- a/make/langtools-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/langtools-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 make/scripts/update_copyright_year.sh
--- a/make/scripts/update_copyright_year.sh	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/scripts/update_copyright_year.sh	Tue Apr 12 18:35:57 2011 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
@@ -152,14 +152,24 @@
     echo "------------------------------------------------"
     hg log --rev ${changeset} --template '{desc}\n' > ${desc}
     printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
-    if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
-      printf "  EXCLUDED tag changeset.\n"
-    elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
-      printf "  EXCLUDED rebrand changeset.\n"
-    elif cat ${desc} | fgrep -i copyright > /dev/null ; then
-      printf "  EXCLUDED copyright changeset.\n"
+    if [ "${year}" = "2010" ] ; then
+      if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+        printf "  EXCLUDED tag changeset.\n"
+      elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
+        printf "  EXCLUDED rebrand changeset.\n"
+      elif cat ${desc} | fgrep -i copyright > /dev/null ; then
+        printf "  EXCLUDED copyright changeset.\n"
+      else
+        updateChangesetFiles ${changeset}
+      fi
     else
-      updateChangesetFiles ${changeset}
+      if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+        printf "  EXCLUDED tag changeset.\n"
+      elif cat ${desc} | fgrep -i "copyright year" > /dev/null ; then
+        printf "  EXCLUDED copyright year changeset.\n"
+      else
+        updateChangesetFiles ${changeset}
+      fi
     fi
     rm -f ${desc}
   done
diff -r 574b71659cb1 -r fc47c97bbbd9 make/sponsors-rules.gmk
--- a/make/sponsors-rules.gmk	Sun Apr 10 10:17:36 2011 -0700
+++ b/make/sponsors-rules.gmk	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, 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
diff -r 574b71659cb1 -r fc47c97bbbd9 test/Makefile
--- a/test/Makefile	Sun Apr 10 10:17:36 2011 -0700
+++ b/test/Makefile	Tue Apr 12 18:35:57 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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