aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2009-12-01 14:01:13 (EST)
committerIgor Fedorenko2009-12-19 16:24:08 (EST)
commit10564f315f2e755302c24af4064281e2ed0f2711 (patch)
treeed92bf4cf30a70382bbe1a32b6f6f119854736af
parent9fd991fcc6c8cde8eda431cfd8a87fa7ff0637f6 (diff)
downloadegit-10564f315f2e755302c24af4064281e2ed0f2711.zip
egit-10564f315f2e755302c24af4064281e2ed0f2711.tar.gz
egit-10564f315f2e755302c24af4064281e2ed0f2711.tar.bz2
Flipped EGit to manifest-first maven-3/tycho buildrefs/changes/35/135/4
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>
-rw-r--r--org.eclipse.egit-feature/pom.xml27
-rw-r--r--org.eclipse.egit-updatesite/pom.xml30
-rw-r--r--org.eclipse.egit-updatesite/site.xml4
-rw-r--r--org.eclipse.egit.core.test/pom.xml43
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java13
-rw-r--r--org.eclipse.egit.core/pom.xml39
-rw-r--r--org.eclipse.egit.ui/pom.xml38
-rw-r--r--org.eclipse.egit/pom.xml26
-rw-r--r--pom.xml89
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 0000000..b1c5b6e
--- /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 0000000..a12a587
--- /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 be43f16..d9e4adf 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 0000000..6371a75
--- /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 81845f9..49b6e36 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 0000000..4aca305
--- /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 0000000..97d8a72
--- /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 0000000..f6b8eb9
--- /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 0000000..8aa798a
--- /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>
+