Index: build.xml
===================================================================
--- build.xml	(revision 595026)
+++ build.xml	(working copy)
@@ -217,16 +217,6 @@
   	
   <target name="javadocs-all" description="Generate javadoc for core, demo and contrib classes" depends="build-contrib">
   	<sequential>
-      <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-      <dirset dir="contrib/gdata-server/src/gom/src/java" id="gdata-server-gom">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-      <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-  		
       <mkdir dir="${javadoc.dir}"/>
       <invoke-javadoc
         destdir="${javadoc.dir}">
@@ -237,9 +227,8 @@
           <packageset dir="src/demo"/>
 
           <!-- please keep this list up to date, and in alpha order...   -->
-          <!-- with the minor exception of gdata which is managed by ref -->
         
-          <!-- ie: `find contrib/* -path \*src/java | grep -v gdata | sort` -->
+          <!-- ie: `find contrib/* -path \*src/java | sort` -->
 
           <!-- if you make changes to the list of package sets, also -->
           <!-- make sure the group list below is updated.            -->
@@ -264,9 +253,6 @@
           <packageset dir="contrib/wordnet/src/java"/>
           <packageset dir="contrib/xml-query-parser/src/java"/>
           <!-- end alpha sort -->
-          <packageset refid="gdata-server-core" />
-          <packageset refid="gdata-server-gom" />
-          <packageset refid="gdata-server-hivemind" />
 
           <!-- If the main javadoc Group listing includes an "Other   -->
           <!-- Packages" group after the ones listed here, then those -->
@@ -281,7 +267,6 @@
           <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
           <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
           <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
-          <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
           <group title="contrib: Lucli" packages="lucli*"/>
           <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
           <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
Index: common-build.xml
===================================================================
--- common-build.xml	(revision 595026)
+++ common-build.xml	(working copy)
@@ -56,11 +56,6 @@
   <path id="javadoc.classpath">
     <path refid="classpath"/>
     <pathelement location="${ant.home}/lib/ant.jar"/>
-
-  	<!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
-    <fileset dir="${common.dir}/contrib">
-        <include name="**/*.jar"/>
-    </fileset>
   </path>
 	
   <property name="project.name" value="site"/> <!-- todo: is this used by anakia or something else? -->
Index: src/site/src/documentation/content/xdocs/site.xml
===================================================================
--- src/site/src/documentation/content/xdocs/site.xml	(revision 595026)
+++ src/site/src/documentation/content/xdocs/site.xml	(working copy)
@@ -58,9 +58,6 @@
 		    <javadoc-contrib-bdb label="Bdb" href="ext:javadocs-contrib-bdb"/>
 		    <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
 		    <javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
-<!--
-		    <javadoc-contrib-gdata label="GData" href="ext:javadocs-contrib-gdata"/>
--->
 		    <javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
 		    <javadoc-contrib-lucli label="Lucli" href="ext:javadocs-contrib-lucli"/>
 		    <javadoc-contrib-memory label="Memory" href="ext:javadocs-contrib-memory"/>
@@ -134,7 +131,6 @@
 	<javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
 	<javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
 	<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
-	<javadocs-contrib-gdata href="api/contrib-gdata/index.html"/>
 	<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
 	<javadocs-contrib-lucli href="api/contrib-lucli/index.html"/>
 	<javadocs-contrib-memory href="api/contrib-memory/index.html"/>