2 files changed, 17 insertions, 62 deletions

diff --git a/releng/org.eclipse.osee.client.releng/build.properties b/releng/org.eclipse.osee.client.releng/build.properties
index 48dbb76a17e..12569ba9d8d 100755
--- a/releng/org.eclipse.osee.client.releng/build.properties
+++ b/releng/org.eclipse.osee.client.releng/build.properties
@@ -4,8 +4,8 @@
 JAVA_HOME=/usr/java
 JAVA60_HOME=/usr/java
 
-eclipse.base.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz
-eclipse.base.file=eclipse-SDK-3.5.2-linux-gtk.tar.gz
+eclipse.base.url=http://download.eclipse.org/eclipse/downloads/drops/S-3.6RC4-201006031500/eclipse-SDK-3.6RC4-linux-gtk.tar.gz
+eclipse.base.file=eclipse-SDK-3.6RC4-linux-gtk.tar.gz
 downloadMirror=http://eclipse.unixheads.org
 
 # To permit automatic downloads of non-EPL compatible code, set this to property to "I accept"
@@ -23,9 +23,8 @@ mainFeatureToBuildID=org.eclipse.osee.client.all.feature
 generateOseeHelp=true
 
 associate.sites=\
-http://download.itemis.com/updates/milestones,\
-http://download.eclipse.org/modeling/emft/updates/releases/,\
-http://download.eclipse.org/releases/galileo,\
+http://download.eclipse.org/releases/helios,\
+http://download.eclipse.org/eclipse/updates/3.6,\
 http://download.eclipse.org/technology/subversive/0.7/update-site/,\
 http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/,\
 http://download.eclipse.org/technology/nebula/xviewer/update-N/,\
@@ -37,61 +36,29 @@ repositoryURLs=\
 ${associate.sites},\
 ${hudsonJobsPath}/org.eclipse.osee.server_nightly/lastSuccessfulBuild/artifact/snapshot/osee_server-incubation-update-N-Snapshot.zip
 
-
 dependencyURLs=\
-${downloadMirror}/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-test-framework-3.5.2.zip
+${downloadMirror}/eclipse/downloads/drops/S-3.6RC4-201006031500/eclipse-test-framework-3.6RC4.zip
 
 featureIDsToInstall=\
-org.eclipse.gef.sdk+\
-org.eclipse.zest.sdk+\
-org.eclipse.draw2d.sdk,\
-org.eclipse.mylyn.wikitext_feature,\
-\
 org.eclipse.team.svn+\
 org.polarion.eclipse.team.svn.connector+\
+org.polarion.eclipse.team.svn.connector.source+\
 org.polarion.eclipse.team.svn.connector.svnkit16+\
 \
+org.eclipse.emf.sdk+\
+org.eclipse.emf.compare.sdk+\
+org.eclipse.xtext.sdk,\
+\
+org.eclipse.gef.sdk+\
+org.eclipse.zest.sdk+\
+org.eclipse.draw2d.sdk+\
+org.eclipse.mylyn.wikitext_feature+\
+\
 org.eclipse.nebula.widgets.calendarcombo.feature+\
 org.eclipse.nebula.widgets.cdatetime.feature+\
 org.eclipse.nebula.cwt.feature+\
 org.eclipse.nebula.widgets.xviewer.feature+\
 \
-org.eclipse.emf.ecoretools.all+\
-\
-org.eclipse.emf.compare.all+\
-\
-org.eclipse.emf.index.feature+\
-\
-org.eclipse.emf.emfindex.runtime+\
-org.eclipse.emf.emfindex.sdk+\
-org.eclipse.emf.emfindex.ui+\
-\
-org.eclipse.emf.mwe.core+\
-org.eclipse.emf.mwe.sdk+\
-org.eclipse.emf.mwe.ui+\
-org.eclipse.emf.mwe2.language.sdk+\
-org.eclipse.emf.mwe2.runtime.sdk+\
-\
-org.eclipse.xpand+\
-org.eclipse.xpand.sdk+\
-org.eclipse.xpand.ui+\
-\
-org.eclipse.xtend+\
-org.eclipse.xtend.dependencies+\
-org.eclipse.xtend.typesystem.emf+\
-org.eclipse.xtend.ui+\
-org.eclipse.xtend.typesystem.uml2+\
-org.eclipse.xtend.typesystem.xsd+\
-\
-org.eclipse.xtext.xbase+\
-org.eclipse.xtext.docs+\
-org.eclipse.xtext.examples+\
-org.eclipse.xtext.runtime+\
-org.eclipse.xtext.sdk+\
-org.eclipse.xtext.ui+\
-\
-de.itemis.xtext.antlr.feature,\
-\
 org.eclipse.birt,\
 \
 org.eclipse.osee.core.feature
diff --git a/releng/org.eclipse.osee.server.releng/build.properties b/releng/org.eclipse.osee.server.releng/build.properties
index 1d3676aee0d..2d89a8d4870 100644
--- a/releng/org.eclipse.osee.server.releng/build.properties
+++ b/releng/org.eclipse.osee.server.releng/build.properties
@@ -1,11 +1,4 @@
 ## BEGIN PROJECT BUILD PROPERTIES ##
-##
-# ATTENTION! 
-# please uncomment the properties below for your local platform after check out.
-# The properties in here will be used to materialize the target platform
-# Also this will make local builds possible.
-
-###############################################################################################
 
 # Linux Local Server #
 JAVA60_HOME=/usr/java
@@ -15,10 +8,6 @@ eclipse.base.url=http://download.eclipse.org/eclipse/downloads/drops/S-3.6RC4-20
 eclipse.base.file=eclipse-SDK-3.6RC4-linux-gtk.tar.gz
 downloadMirror=http://eclipse.unixheads.org
 
-###############################################################################################
-# default settings for all this project's builds, for this branch; 
-#see also o.e.d.common.releng/build.properties for more overrideable defaults
-
 # To permit automatic downloads of non-EPL compatible code, set this to property to "I accept"
 thirdPartyDownloadLicenseAcceptance="I accept"
 
@@ -38,9 +27,8 @@ http://download.eclipse.org/eclipse/updates/3.6,\
 http://download.eclipse.org/technology/subversive/0.7/update-site/,\
 http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/
 
-dependencyURLs=
-#\
-#${downloadMirror}/eclipse/downloads/drops/S-3.6RC4-201006031500/eclipse-test-framework-3.6RC4.zip
+dependencyURLs=\
+${downloadMirror}/eclipse/downloads/drops/S-3.6RC4-201006031500/eclipse-test-framework-3.6RC4.zip
 
 featureIDsToInstall=\
 org.eclipse.team.svn+\