Re: [egit-dev] Calling Tycho / Maven Ninjas

[Igor Fedorenko <ifedorenko@xxxxxxxxxxxx>]

I think I fixed it, at least the build works on my linux desktop. See
attached pom-cleanup.diff. I basically moved all tycho configuration to
the parent pom to make sure it is consistently applied to all modules.
Most likely one of the modules missed a dependency.

I can provide more detailed explanation, if anyone is interested in what
is actually going on under the hood.

--
Regards,
Igor

Chris Aniszczyk wrote:
> We are close to getting our build in order with EGit, however, we are
> having issues with Tycho not finding JGit.
>     http://egit.eclipse.org/r/#change,206
>
> Any Maven Tycho experts out there have an idea?
>
> The console log is here:
>     https://build.eclipse.org/hudson/job/egit/10/console
>
> The error message is pretty obvious... but I'm not sure what Tycho is
> using to lookup the bundle.
>
> Cheers,
diff --git a/org.eclipse.egit-updatesite/pom.xml b/org.eclipse.egit-updatesite/pom.xml
index 8515a1f..a12a587 100644
--- a/org.eclipse.egit-updatesite/pom.xml
+++ b/org.eclipse.egit-updatesite/pom.xml
@@ -24,27 +24,6 @@
 
   <name>Eclipse Git Plugin Update Site</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-          <pomDependencies>consider</pomDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
   <version>0.6.0</version>
 
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index c86b70f..6371a75 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -23,26 +23,10 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Test Plug-in (Incubation)</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-          <pomDependencies>consider</pomDependencies>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.sonatype.tycho</groupId>
         <artifactId>maven-osgi-test-plugin</artifactId>
         <version>${tycho-version}</version>
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
index dcf5277..4aca305 100644
--- a/org.eclipse.egit.core/pom.xml
+++ b/org.eclipse.egit.core/pom.xml
@@ -24,14 +24,6 @@
 
   <name>Git Team Provider (Core) (Incubation)</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
   <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
   <build>
     <resources>
@@ -42,17 +34,6 @@
         </excludes>
       </resource>
     </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-          <pomDependencies>consider</pomDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
 
 </project>
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml
index 6b7538c..97d8a72 100644
--- a/org.eclipse.egit.ui/pom.xml
+++ b/org.eclipse.egit.ui/pom.xml
@@ -24,14 +24,6 @@
 
   <name>Git Team Provider (UI) (Incubation)</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
   <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
   <build>
     <resources>
@@ -42,16 +34,5 @@
         </excludes>
       </resource>
     </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-          <pomDependencies>consider</pomDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 8aa798a..f06b2a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
 
   <properties>
     <tycho-version>0.6.0</tycho-version>
+    <jgit-version>0.6.0-SNAPSHOT</jgit-version>
   </properties>
 
   <modules>
@@ -47,6 +48,19 @@
     </repository>
   </repositories>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit</artifactId>
+      <version>${jgit-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit.junit</artifactId>
+      <version>${jgit-version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -61,6 +75,7 @@
         <version>${tycho-version}</version>
         <configuration>
           <resolver>p2</resolver>
+          <pomDependencies>consider</pomDependencies>
         </configuration>
       </plugin>
     </plugins>