diff --git a/checkFile.awk b/checkFile.awk
index fb78cc1..3ef4112 100644
--- a/checkFile.awk
+++ b/checkFile.awk
@@ -1,5 +1,5 @@
 #!/bin/gawk
-# $Id: $
+# $Id$
 #
 # Licensed to Julian Hyde under one or more contributor license
 # agreements. See the NOTICE file distributed with this work for
diff --git a/doc/pdfdoclet.properties b/doc/pdfdoclet.properties
index 2f12d91..6be7484 100644
--- a/doc/pdfdoclet.properties
+++ b/doc/pdfdoclet.properties
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id$
 # Configuration file for PDFDoclet.
 
 ############################################################
diff --git a/foodmart/FoodMart.xml b/foodmart/FoodMart.xml
index 1cc36cd..8536a83 100644
--- a/foodmart/FoodMart.xml
+++ b/foodmart/FoodMart.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Schema name="FoodMart">
 <!--
-  == $Id:$
+  == $Id$
   ==
   == Licensed to Julian Hyde under one or more contributor license
   == agreements. See the NOTICE file distributed with this work for
diff --git a/ivy-jdk14.xml b/ivy-jdk14.xml
index 5175f37..e9f6d1c 100644
--- a/ivy-jdk14.xml
+++ b/ivy-jdk14.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <!--
-  == $Id:$
-  == This software is subject to the terms of the Eclipse Public License v1.0
-  == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2009-2011 Julian Hyde
-  == All Rights Reserved.
-  == You must accept the terms of that agreement to use this software.
+  == $Id$
+  ==
+  == Licensed to Julian Hyde under one or more contributor license
+  == agreements. See the NOTICE file distributed with this work for
+  == additional information regarding copyright ownership.
+  ==
+  == Julian Hyde 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.
   -->
 <ivy-module
     version="2.0"
@@ -15,7 +25,7 @@
     xmlns:m="http://ant.apache.org/ivy/maven"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
   <info organisation="${ivy.artifact.group}" module="${ivy.artifact.id}-jdk14" revision="${project.revision}">
-      <license name="EPL" url="http://www.eclipse.org/legal/epl-v10.html"/>
+      <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
       <ivyauthor name="Julian Hyde" />
       <repository name="pentaho-repository" url="http://repo.pentaho.org/artifactory"/>
       <description homepage="http://olap4j.org">
diff --git a/ivy-tck.xml b/ivy-tck.xml
index a82bc6b..af44963 100644
--- a/ivy-tck.xml
+++ b/ivy-tck.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <!--
-  == $Id:$
+  == $Id$
   ==
   == Licensed to Julian Hyde under one or more contributor license
   == agreements. See the NOTICE file distributed with this work for
diff --git a/ivy-xmla.xml b/ivy-xmla.xml
index 3a61b98..b95424f 100644
--- a/ivy-xmla.xml
+++ b/ivy-xmla.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <!--
-  == $Id:$
+  == $Id$
   ==
   == Licensed to Julian Hyde under one or more contributor license
   == agreements. See the NOTICE file distributed with this work for
diff --git a/ivy.xml b/ivy.xml
index 4fb76a8..b537506 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
 <!--
-  == $Id:$
+  == $Id$
   ==
   == Licensed to Julian Hyde under one or more contributor license
   == agreements. See the NOTICE file distributed with this work for
diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java b/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java
index 42c670b..2b0313e 100644
--- a/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java
+++ b/src/org/olap4j/driver/xmla/FactoryJdbc41Impl.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -30,7 +30,7 @@
  * Implementation of {@link Factory} for JDBC 4.0.
  *
  * @author jhyde
- * @version $Id: FactoryJdbc41Impl.java 476 2011-10-24 17:54:40Z jhyde $
+ * @version $Id$
  * @since Jun 14, 2007
  */
 class FactoryJdbc41Impl implements Factory {
diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java b/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java
index d760dcf..c6086e6 100644
--- a/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java
+++ b/src/org/olap4j/driver/xmla/FactoryJdbc4Plus.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -31,7 +31,7 @@
  * Abstract JDBC classes, for JDBC 4.0 and 4.1.
  *
  * @author jhyde
- * @version $Id: FactoryJdbc4Impl.java 476 2011-10-24 17:54:40Z jhyde $
+ * @version $Id$
  */
 class FactoryJdbc4Plus {
     private FactoryJdbc4Plus() {
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java
index 09f17dd..221f441 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabase.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -30,7 +30,7 @@
 
 /**
  * XMLA implementation of a database metadata object.
- * @version $Id:$
+ * @version $Id$
  * @author LBoudreau
  */
 class XmlaOlap4jDatabase implements Database, Named {
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java b/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java
index 288261a..bed9e4b 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jServerInfos.java
@@ -1,5 +1,5 @@
 /*
-// $Id:$
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -23,7 +23,7 @@
 
 /**
  * Common set of functions for an XMLA URL Provider.
- * @version $Id:$
+ * @version $Id$
  */
 public interface XmlaOlap4jServerInfos {
     /**
diff --git a/src/org/olap4j/impl/LcidLocale.java b/src/org/olap4j/impl/LcidLocale.java
index 62befd3..7a97e3c 100644
--- a/src/org/olap4j/impl/LcidLocale.java
+++ b/src/org/olap4j/impl/LcidLocale.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -24,7 +24,7 @@
 /**
  * Mapping between {@link Locale} and Locale identifier (LCID).
  *
- * @version $Id: //open/mondrian/src/main/mondrian/util/LcidLocale.java#1 $
+ * @version $Id$
  * @author jhyde
  */
 public class LcidLocale {
diff --git a/src/org/olap4j/metadata/Database.java b/src/org/olap4j/metadata/Database.java
index 8001ddd..b2de551 100644
--- a/src/org/olap4j/metadata/Database.java
+++ b/src/org/olap4j/metadata/Database.java
@@ -1,5 +1,5 @@
 /*
-// $Id:$
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -62,7 +62,7 @@
  * </p>
  *
  * @author Luc Boudreau
- * @version $Id:$
+ * @version $Id$
  * @since Jan 15 2011
  */
 public interface Database {
diff --git a/src/org/olap4j/query/AbstractSelection.java b/src/org/olap4j/query/AbstractSelection.java
index 9a93d38..6f1c1bf 100644
--- a/src/org/olap4j/query/AbstractSelection.java
+++ b/src/org/olap4j/query/AbstractSelection.java
@@ -1,5 +1,5 @@
 /*
-// $Id:$
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -27,7 +27,7 @@
 /**
  * Abstract implementation of a selection.
  * @author LBoudreau
- * @version $Id:$
+ * @version $Id$
  */
 abstract class AbstractSelection extends QueryNodeImpl implements Selection {
 
diff --git a/test.properties b/test.properties
index 030adb6..5631d86 100644
--- a/test.properties
+++ b/test.properties
@@ -1,5 +1,5 @@
 #
-# $Id:$
+# $Id$
 #
 # Licensed to Julian Hyde under one or more contributor license
 # agreements. See the NOTICE file distributed with this work for
diff --git a/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java b/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java
index 03388ae..a1c3580 100644
--- a/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java
+++ b/testsrc/org/olap4j/driver/xmla/cache/XmlaDatabaseCache.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 //
 // Licensed to Julian Hyde under one or more contributor license
 // agreements. See the NOTICE file distributed with this work for
@@ -29,7 +29,7 @@
  *
  * @see Properties
  * @author LBoudreau
- * @version $Id: $
+ * @version $Id$
  */
 public class XmlaDatabaseCache implements XmlaOlap4jCache {