Adds collaborative-modeling profile and updates to 4.5M4 and to 4.4SR1

Change-Id: If5bb5673f35588fea0897947c80b9c94ab2db948

2 files changed, 44 insertions, 7 deletions

diff --git a/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh b/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh
index a1ca05889..5dd997dcb 100644
--- a/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh
+++ b/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh
@@ -55,10 +55,14 @@ else
 	tar zxf "$P2_ADMIN_ZIPPATH" -C $workdir
 fi
 
-
-if [[ "$simrel" == "mars"* ]]; then
-	simrel_zip_name="eclipse-SDK-4.5M3-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}"
-	simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/S-4.5M3-201410292000/$simrel_zip_name"	
+if [[ "$simrel" == "collaborative-modeling"* ]]; then
+	simrel_zip_name="Collaborative-Modeling-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}"
+	simrel_zip_url="http://download.eclipse.org/modeling/emf/compare/collaborative-modeling-package/nightly/$simrel_zip_name"	
+	p2_repositories=""
+	p2_installIUs=""
+elif [[ "$simrel" == "mars"* ]]; then
+	simrel_zip_name="eclipse-SDK-4.5M4-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}"
+	simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/S-4.5M4-201412102000/$simrel_zip_name"	
 	p2_repositories="http://download.eclipse.org/releases/mars/,\
 http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\
 http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/"
@@ -71,8 +75,8 @@ org.eclipse.emf.compare.uml2.feature.group,\
 org.eclipse.emf.compare.diagram.gmf.feature.group,\
 org.eclipse.emf.compare.diagram.papyrus.feature.group"
 elif [[ "$simrel" == "luna"* ]]; then
-	simrel_zip_name="eclipse-SDK-4.4-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}"
-	simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/$simrel_zip_name"
+	simrel_zip_name="eclipse-SDK-4.4.1-${PLATFORM_SHORT_SPECIFIER}.${FILE_EXT}"
+	simrel_zip_url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/$simrel_zip_name"
 	p2_repositories="http://download.eclipse.org/releases/luna/,\
 http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/,\
 http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/"
@@ -129,4 +133,6 @@ fi
 echo "Provisioning AUT"
 echo "  Repositories: $p2_repositories"
 echo "  IUs: $p2_installIUs"
-$P2_ADMIN_PATH/p2-admin -vm $JAVA_HOME/bin/java -application org.eclipse.equinox.p2.director -repository "$p2_repositories" -installIU "$p2_installIUs" -tag Q7_AUT -destination "$simrel_path/eclipse" -profile SDKProfile
+if [ -n "$p2_repositories" ]; then 
+	$P2_ADMIN_PATH/p2-admin -vm $JAVA_HOME/bin/java -application org.eclipse.equinox.p2.director -repository "$p2_repositories" -installIU "$p2_installIUs" -tag Q7_AUT -destination "$simrel_path/eclipse" -profile SDKProfile
+fi
diff --git a/plugins/org.eclipse.emf.compare.q7.tests/pom.xml b/plugins/org.eclipse.emf.compare.q7.tests/pom.xml
index 5a10cf824..93ef0a8c9 100644
--- a/plugins/org.eclipse.emf.compare.q7.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.q7.tests/pom.xml
@@ -53,6 +53,37 @@
   </build>

  

   <profiles>

+    <profile>

+      <id>collaborative-modeling</id>

+      <properties>

+        <profile-id>collaborative-modeling</profile-id>

+      </properties>

+      <activation>

+        <activeByDefault>true</activeByDefault>

+      </activation>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>com.xored.q7</groupId>

+            <artifactId>q7-maven-plugin</artifactId>

+            <version>${q7-maven-version}</version>

+            <extensions>true</extensions>

+            <configuration>

+              <aut>

+                <explicit>${project.build.directory}/${profile-id}/eclipse</explicit>

+              </aut>

+              <testFailureIgnore>${testFailureIgnore}</testFailureIgnore>

+              <suites>

+                <suite>TestSuite.Full</suite>

+              </suites>

+              <q7>

+                <version>${q7-runner-version}</version>

+              </q7>

+            </configuration>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

    <profile>

       <id>mars</id>

       <properties>