Flipped EGit to manifest-first maven-3/tycho build

New org.sonatype.tycho groupId https://issues.sonatype.org/browse/TYCHO-312
Workaround for https://issues.sonatype.org/browse/TYCHO-168

Removed checkNotNested. Conventional maven project layout results in the following
repository nesting

parallelip-egit <= egit source tree root
  /.git
  /org.eclipse.egit.core.test
    /target
      /work
        /data <= test workspace
          /.git
          /.metadata
          /Project-1

Disable checkNotNested as a short term solution, but in the long term we need to
reintroduce this check with mechanisms like Git's GIT_CEILING_DIRECTORIES to make
sure it does not produce false positive during maven build.

Change-Id: Idec24de111aa21a022654c443376e42ae6caa7cc
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

9 files changed, 294 insertions, 15 deletions

diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml
new file mode 100644
index 0000000000..b1c5b6e009
--- /dev/null
+++ b/org.eclipse.egit-feature/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.egit</groupId>
+    <artifactId>egit-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.egit-feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+
+  <name>Eclipse Git Feature (Incubation)</name>
+
+</project>
diff --git a/org.eclipse.egit-updatesite/pom.xml b/org.eclipse.egit-updatesite/pom.xml
new file mode 100644
index 0000000000..a12a5879c7
--- /dev/null
+++ b/org.eclipse.egit-updatesite/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.egit</groupId>
+    <artifactId>egit-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.egit-updatesite</artifactId>
+  <packaging>eclipse-update-site</packaging>
+
+  <name>Eclipse Git Plugin Update Site</name>
+
+  <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
+  <version>0.6.0</version>
+
+</project>
diff --git a/org.eclipse.egit-updatesite/site.xml b/org.eclipse.egit-updatesite/site.xml
index be43f16d6f..d9e4adfb48 100644
--- a/org.eclipse.egit-updatesite/site.xml
+++ b/org.eclipse.egit-updatesite/site.xml
@@ -3,10 +3,10 @@
    <description url="Eclipse Git Plugin">
       This is a pure Java implementation of the Git version control system. The native Git version is also required in this version,
    </description>
-   <feature url="features/org.eclipse.egit_0.6.0.qualifier.jar" id="org.eclipse.egit" version="0.6.0.qualifier" patch="true">
+   <feature url="features/org.eclipse.egit_0.0.0.qualifier.jar" id="org.eclipse.egit" version="0.0.0" patch="true">
       <category name="Eclipse Git Plugin (Incubation)"/>
    </feature>
-   <feature url="features/org.eclipse.jgit_0.6.0.qualifier.jar" id="org.eclipse.jgit" version="0.6.0.qualifier">
+   <feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0">
       <category name="Eclipse Git Plugin (Incubation)"/>
    </feature>
    <category-def name="Eclipse Git Plugin (Incubation)" label="Eclipse Git Plugin (Incubation)">
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
new file mode 100644
index 0000000000..6371a75acc
--- /dev/null
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.egit</groupId>
+    <artifactId>egit-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.egit.core.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <name>Test Plug-in (Incubation)</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>maven-osgi-test-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <excludes>
+            <!-- test mojo matches TestProject be default and treats it as PojoTest -->
+            <exclude>**/Test*.class</exclude>
+          </excludes>
+          <useUIHarness>true</useUIHarness>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
index 81845f9c16..49b6e36ae4 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
@@ -10,11 +10,6 @@ package org.eclipse.egit.core.test;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collection;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.egit.core.project.RepositoryFinder;
-import org.eclipse.egit.core.project.RepositoryMapping;
 
 import junit.framework.TestCase;
 
@@ -27,7 +22,6 @@ public abstract class GitTestCase extends TestCase {
 	protected void setUp() throws Exception {
 		super.setUp();
 		project = new TestProject(true);
-		checkNotNested();
 		gitDir = new File(project.getProject().getWorkspace().getRoot()
 				.getRawLocation().toFile(), ".git");
 		rmrf(gitDir);
@@ -57,11 +51,4 @@ public abstract class GitTestCase extends TestCase {
 		assert !d.exists();
 	}
 
-	protected void checkNotNested() throws CoreException {
-		final Collection<RepositoryMapping> parentRepositories = new RepositoryFinder(
-				project.getProject()).find(null);
-		final int numOfRepositories = parentRepositories.size();
-		assertTrue("parent repository found", numOfRepositories == 0);
-	}
-
 }
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
new file mode 100644
index 0000000000..4aca30577f
--- /dev/null
+++ b/org.eclipse.egit.core/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.egit</groupId>
+    <artifactId>egit-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.egit.core</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>Git Team Provider (Core) (Incubation)</name>
+
+  <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
+  <build>
+    <resources>
+      <resource>
+        <directory>src</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+
+</project>
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml
new file mode 100644
index 0000000000..97d8a724e2
--- /dev/null
+++ b/org.eclipse.egit.ui/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.egit</groupId>
+    <artifactId>egit-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.egit.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>Git Team Provider (UI) (Incubation)</name>
+
+  <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
+  <build>
+    <resources>
+      <resource>
+        <directory>src</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml
new file mode 100644
index 0000000000..f6b8eb9c5c
--- /dev/null
+++ b/org.eclipse.egit/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.egit</groupId>
+    <artifactId>egit-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.egit</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>Eclipse Git (Incubation)</name>
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..8aa798af88
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+
+  <groupId>org.eclipse.egit</groupId>
+  <artifactId>egit-parent</artifactId>
+  <version>0.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>EGit Parent</name>
+
+  <properties>
+    <tycho-version>0.6.0</tycho-version>
+  </properties>
+
+  <modules>
+    <module>org.eclipse.egit</module>
+    <module>org.eclipse.egit.core</module>
+    <module>org.eclipse.egit.ui</module>
+
+    <module>org.eclipse.egit-feature</module>
+    <module>org.eclipse.egit-updatesite</module>
+
+    <module>org.eclipse.egit.core.test</module>
+  </modules>
+
+  <repositories>
+    <repository>
+      <id>galileo</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/releases/galileo</url>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <resolver>p2</resolver>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonatype.tycho</groupId>
+          <artifactId>maven-osgi-compiler-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <encoding>UTF-8</encoding>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.4.1</version>
+          <configuration>
+            <encoding>ISO-8859-1</encoding>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
+