diff --git a/eclipse/org.mybatis.generator.eclipse.site/.gitignore b/eclipse/org.mybatis.generator.eclipse.site/.gitignore
index fb99f9184e..b83d22266a 100644
--- a/eclipse/org.mybatis.generator.eclipse.site/.gitignore
+++ b/eclipse/org.mybatis.generator.eclipse.site/.gitignore
@@ -1,2 +1 @@
 /target/
-/workspace/
diff --git a/eclipse/org.mybatis.generator.eclipse.site/downloadMetadata.ant b/eclipse/org.mybatis.generator.eclipse.site/downloadMetadata.ant
index 5a7cd7569c..519f4a8df6 100644
--- a/eclipse/org.mybatis.generator.eclipse.site/downloadMetadata.ant
+++ b/eclipse/org.mybatis.generator.eclipse.site/downloadMetadata.ant
@@ -23,32 +23,22 @@
   This file will download the existing P2 composite metadata so we can add our new
   version.
   The following environment properties are expected:
-  
+
     p2.repo.base.directory (the location of the local composite repo)
-    
+
 -->
 <project name="project" default="download">
   <target name="init">
     <!-- Create repository directories if they don't already exist -->
     <mkdir dir="${p2.repo.base.directory}"/>
   </target>
-  
+
   <target name="download" depends="init">
-    
     <get dest="${p2.repo.base.directory}/compositeArtifacts.xml" ignoreerrors="true">
       <url url="https://mybatis.jfrog.io/artifactory/generator-eclipse-release/compositeArtifacts.xml"/>
     </get>
-      
     <get dest="${p2.repo.base.directory}/compositeContent.xml" ignoreerrors="true">
       <url url="https://mybatis.jfrog.io/artifactory/generator-eclipse-release/compositeContent.xml"/>
     </get>
-    
-    <replaceregexp byline="true">
-      <regexp pattern="property name='p2.atomic.composite.loading' value='true'" />
-      <substitution expression="property name='p2.atomic.composite.loading' value='false'" />
-      <fileset dir="${p2.repo.base.directory}">
-        <include name="*.xml" />
-      </fileset>
-    </replaceregexp>
   </target>
 </project>
diff --git a/eclipse/org.mybatis.generator.eclipse.site/pom.xml b/eclipse/org.mybatis.generator.eclipse.site/pom.xml
index ceb341678d..737ff0443b 100644
--- a/eclipse/org.mybatis.generator.eclipse.site/pom.xml
+++ b/eclipse/org.mybatis.generator.eclipse.site/pom.xml
@@ -45,17 +45,6 @@
           <finalName>${project.artifactId}-${qualifiedVersion}</finalName>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>workspace</directory>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   
@@ -95,9 +84,9 @@
             <configuration>
               <repositories>
                 <repository>
-                  <id>Oldest Version Supporting Java 11</id>
+                  <id>Eclipse Latest</id>
                   <layout>p2</layout>
-                  <url>http://download.eclipse.org/releases/2018-12</url>
+                  <url>http://download.eclipse.org/releases/latest</url>
                 </repository>
               </repositories>
               <dependencies>
diff --git a/eclipse/org.mybatis.generator.eclipse.site/updateP2CompositeRepo.ant b/eclipse/org.mybatis.generator.eclipse.site/updateP2CompositeRepo.ant
index fe7401934d..fddd20e7e6 100644
--- a/eclipse/org.mybatis.generator.eclipse.site/updateP2CompositeRepo.ant
+++ b/eclipse/org.mybatis.generator.eclipse.site/updateP2CompositeRepo.ant
@@ -35,7 +35,7 @@
   <target name="init">
     <property name="repo.drops.dir" value="${p2.repo.base.directory}/drops"/>
     <property name="repo.zipped.dir" value="${p2.repo.base.directory}/zipped"/>
-    
+
     <!-- Create repository directories if they don't already exist -->
     <mkdir dir="${p2.repo.base.directory}"/>
     <mkdir dir="${repo.drops.dir}"/>
@@ -52,6 +52,15 @@
       <fileset dir="${project.build.directory}/repository"/>
     </copy>
     
+    <!-- turn off composite loading so we don't download all the old versions -->
+    <replaceregexp byline="true">
+      <regexp pattern="property name='p2.atomic.composite.loading' value='true'" />
+      <substitution expression="property name='p2.atomic.composite.loading' value='false'" />
+      <fileset dir="${p2.repo.base.directory}">
+        <include name="*.xml" />
+      </fileset>
+    </replaceregexp>
+
     <!-- update composite repo (this task needs to run in the Eclipse runtime) -->
     <p2.composite.repository>
       <repository compressed="false" location="${p2.repo.base.directory}"/>
@@ -69,11 +78,11 @@
         <include name="*.xml" />
       </fileset>
     </replaceregexp>
-  	
-  	<!-- setup the shebang and variables -->
-  	<echo message="#!/bin/bash${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" />
-  	<echo message="USER=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />
-  	<echo message="API_KEY=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />
+
+    <!-- setup the shebang and variables -->
+    <echo message="#!/bin/bash${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" />
+    <echo message="USER=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />
+    <echo message="API_KEY=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />
 
     <!-- generate the jfrog upload script -->
     <!-- Write curl lines for every file we need to upload -->
@@ -82,7 +91,7 @@
       <srcfile />
       <arg value="-u$USER:$API_KEY"/>
       <targetfile/>
-      
+
       <fileset dir="${p2.repo.base.directory}" >
         <include name="drops/**/*.*"/>
         <include name="*.xml"/>
@@ -90,9 +99,9 @@
       </fileset>
       <globmapper from="*" to="&quot;https://mybatis.jfrog.io/artifactory/generator-eclipse-release/*&quot;" />
     </apply>
-    
+
     <!-- make it executable -->
     <chmod perm="+x" file="${p2.repo.base.directory}/jfrogUpload.sh"/>
-    
+
   </target>
 </project>