Revert "Changes in parent pom.xml required for running integration te…

…sts:" This reverts commit 54c6609.
eclipse-birt · May 14, 2015 · 1a91bc9 · 1a91bc9
1 parent 0bfaddb
commit 1a91bc9
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,7 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -11,23 +14,34 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <tycho.version>0.21.0</tycho.version>
+<<<<<<< HEAD
         <eclipse.repo.url>http://download.eclipse.org/eclipse/updates/4.5-I-builds/</eclipse.repo.url>
         <emf.repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.10/</emf.repo.url>
         <wtp.repo.url>http://download.eclipse.org/webtools/repository/luna/</wtp.repo.url>
         <gef.repo.url>http://download.eclipse.org/tools/gef/updates/releases/</gef.repo.url>
         <orbit.repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository/</orbit.repo.url>
+=======
+        <eclipse.repo.url>http://download.eclipse.org/eclipse/updates/4.4/</eclipse.repo.url>
+        <emf.repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.10/</emf.repo.url>
+        <wtp.repo.url>http://download.eclipse.org/webtools/repository/luna/</wtp.repo.url>
+        <gef.repo.url>http://download.eclipse.org/tools/gef/updates/releases/</gef.repo.url>
+        <orbit.repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</orbit.repo.url>
+>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
         <!-- use local dtp git -->
         <dtp.repo.url>http://download.eclipse.org/datatools/updates/1.12</dtp.repo.url>
     </properties>
 
     <repositories>
         <!-- BIRT need Eclipse/EMF/GEF/DTP/ORBIT/WTP-->
         <repository>
+<<<<<<< HEAD
             <id>eclipse</id>
             <url>${eclipse.repo.url}</url>
             <layout>p2</layout>
         </repository>
         <repository>
+=======
+>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
             <id>emf</id>
             <url>${emf.repo.url}</url>
             <layout>p2</layout>
@@ -43,6 +57,14 @@
             <layout>p2</layout>
         </repository>
         <repository>
+<<<<<<< HEAD
+=======
+            <id>eclipse</id>
+            <url>${eclipse.repo.url}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"
             <id>orbit</id>
             <url>${orbit.repo.url}</url>
             <layout>p2</layout>
@@ -234,6 +256,7 @@
 		</plugins>
 	</build>
 </project>
+<<<<<<< HEAD
 =======
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
@@ -533,3 +556,5 @@
 	</build>
 </project>
 >>>>>>> Changes in parent pom.xml required for running integration tests:
+=======
+>>>>>>> Revert "Changes in parent pom.xml required for running integration tests:"