[570840] Fix problem with interim repository.
diff --git a/releng/org.eclipse.uml2.build-feature/updates.sh b/releng/org.eclipse.uml2.build-feature/updates.sh
index dcd65a3..3a2f352 100644
--- a/releng/org.eclipse.uml2.build-feature/updates.sh
+++ b/releng/org.eclipse.uml2.build-feature/updates.sh
@@ -13,6 +13,10 @@
projectRepoName="Unified Modeling Language 2.x (UML2)"
manageComposite="/shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml"
+export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
+java -version
+/shared/common/apache-ant-latest/bin/ant -version
+
if [ -n "${PUBLISH__BUILD_TYPE}" ]
then
@@ -42,48 +46,52 @@
mkdir -p ${repoFolder}
fi
- pushd ${repoFolder}
-
- buildFolder="${PUBLISH__BUILD_TYPE}${PUBLISH__QUALIFIER:1:8}${PUBLISH__QUALIFIER:10:4}"
-
- if [ ! -d "${buildFolder}" ]
- then
- mkdir ${buildFolder}
- fi
-
- curl -s -k ${PUBLISH__BUILD}/artifact/releng/org.eclipse.uml2.build-feature/target/org.eclipse.uml2-${PUBLISH__VERSION}.${PUBLISH__QUALIFIER}.zip > ${localZip}
- unzip ${localZip} -d ${buildFolder}
- rm ${localZip}
-
- chgrp -R ${group} ${buildFolder}
- chmod -R g+w ${buildFolder}
- ${manageComposite} add -Dchild.repository=${buildFolder} -Dcomposite.name="${projectRepoName} ${PUBLISH__VERSION} ${repoName} Site"
-
- popd
+# pushd ${repoFolder}
+#
+# buildFolder="${PUBLISH__BUILD_TYPE}${PUBLISH__QUALIFIER:1:8}${PUBLISH__QUALIFIER:10:4}"
+#
+# if [ ! -d "${buildFolder}" ]
+# then
+# mkdir ${buildFolder}
+# fi
+#
+# curl -s -k ${PUBLISH__BUILD}/artifact/releng/org.eclipse.uml2.build-feature/target/org.eclipse.uml2-${PUBLISH__VERSION}.${PUBLISH__QUALIFIER}.zip > ${localZip}
+# unzip ${localZip} -d ${buildFolder}
+# rm ${localZip}
+#
+# chgrp -R ${group} ${buildFolder}
+# chmod -R g+w ${buildFolder}
+# ${manageComposite} add -Dchild.repository=${buildFolder} -Dcomposite.name="${projectRepoName} ${PUBLISH__VERSION} ${repoName} Site"
+#
+# popd
if [ "${PUBLISH__BUILD_TYPE}" = "I" ]
- then
+ then
pushd ${updatesFolder}interim
- mkdir newlatest
- chgrp -R ${group} newlatest
- chmod -R g+w newlatest
-
- pushd ${updatesFolder}interim/newlatest
- ${manageComposite} add -Dchild.repository=../../${PUBLISH__VERSION:0:3}-I-builds/${buildFolder} -Dcomposite.name="${projectRepoName} Latest Interim Build Site"
- popd
+ ${manageComposite} remove -Dchild.repository=../5.5-I-builds -Dcomposite.name="${projectRepoName} Interim Build Site"
- if [ -d "latest" ]
- then
- mv latest oldlatest
- fi
+ ${manageComposite} add -Dchild.repository=../5.6-I-builds -Dcomposite.name="${projectRepoName} Interim Build Site"
- mv newlatest latest
-
- if [ -d "oldlatest" ]
- then
- rm -rf oldlatest
- fi
+# mkdir newlatest
+# chgrp -R ${group} newlatest
+# chmod -R g+w newlatest
+#
+# pushd ${updatesFolder}interim/newlatest
+# ${manageComposite} add -Dchild.repository=../../${PUBLISH__VERSION:0:3}-I-builds/${buildFolder} -Dcomposite.name="${projectRepoName} Latest Interim Build Site"
+# popd
+#
+# if [ -d "latest" ]
+# then
+# mv latest oldlatest
+# fi
+#
+# mv newlatest latest
+#
+# if [ -d "oldlatest" ]
+# then
+# rm -rf oldlatest
+# fi
popd
elif [ "${PUBLISH__BUILD_TYPE}" = "S" ]