Revert "Fixes the clean-integration target to handle merged ivy-cache and integration repo"
This reverts commit aab07dd6b4e302f674a28d4e82e6a2c1905ba739.
diff --git a/build.properties b/build.properties
index e618211..46bff5f 100644
--- a/build.properties
+++ b/build.properties
@@ -2,8 +2,7 @@
release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
ivy.cache.dir=${basedir}/../ivy-cache
-integration.repo.dir=${basedir}/../integration-repo
-project.organisation=org.eclipse.virgo.build
+integration.repo.dir=${basedir}/../integration-repo
findbugs.enforce=true
clover.enforce=true
clover.coverage=85%
diff --git a/common/common.xml b/common/common.xml
index d1f61e6..a518849 100644
--- a/common/common.xml
+++ b/common/common.xml
@@ -43,14 +43,7 @@
</not>
</condition>
</fail>
- <fail message="The 'project.organisation' property must be set on this project.">
- <condition>
- <not>
- <isset property="project.organisation"/>
- </not>
- </condition>
- </fail>
- <delete dir="${integration.repo.dir}/${project.organisation}"/>
+ <delete quiet="true" dir="${integration.repo.dir}"/>
</target>
<target name="clean-ivy" description="Removes the ivy cache directory.">
diff --git a/multi-bundle/common.xml b/multi-bundle/common.xml
index e48fee8..6803fa9 100644
--- a/multi-bundle/common.xml
+++ b/multi-bundle/common.xml
@@ -99,7 +99,8 @@
<all-bundles target="clean"/>
</target>
- <target name="clean-integration" description="Removes the integration repository directory.">
+ <target name="clean-integration"
+ description="Removes the integration repository directory.">
<fail message="The 'integration.repo.dir' property must be set on this project.">
<condition>
<not>
@@ -107,14 +108,7 @@
</not>
</condition>
</fail>
- <fail message="The 'project.organisation' property must be set on this project.">
- <condition>
- <not>
- <isset property="project.organisation"/>
- </not>
- </condition>
- </fail>
- <delete dir="${integration.repo.dir}/${project.organisation}"/>
+ <delete quiet="true" dir="${integration.repo.dir}"/>
</target>
<target name="clean-ivy" depends="ivy.init"
