Bug 396100 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) for eclipse.platform.relengv20121210-194028

10 files changed, 223 insertions, 5 deletions

diff --git a/bundles/org.eclipse.cvs/pom.xml b/bundles/org.eclipse.cvs/pom.xml
index 23c99ef2..faefdc7b 100644
--- a/bundles/org.eclipse.cvs/pom.xml
+++ b/bundles/org.eclipse.cvs/pom.xml
@@ -27,4 +27,43 @@
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <format>'v${maven.build.timestamp}'</format>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>update-branding-plugins</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <configuration>
+                  <tasks>
+                    <replace file="about.mappings" 
+                             token="@build@" value="${buildId}" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/bundles/org.eclipse.rcp/pom.xml b/bundles/org.eclipse.rcp/pom.xml
index 8aef0642..e56e7316 100644
--- a/bundles/org.eclipse.rcp/pom.xml
+++ b/bundles/org.eclipse.rcp/pom.xml
@@ -28,4 +28,43 @@
   <version>4.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <format>'v${maven.build.timestamp}'</format>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>update-branding-plugins</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <configuration>
+                  <tasks>
+                    <replace file="about.mappings" 
+                             token="@build@" value="${buildId}" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/bundles/org.eclipse.releng.tools/pom.xml b/bundles/org.eclipse.releng.tools/pom.xml
index ca4d109b..c0e8aee1 100644
--- a/bundles/org.eclipse.releng.tools/pom.xml
+++ b/bundles/org.eclipse.releng.tools/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>org.eclipse.releng.tools</groupId>
   <artifactId>org.eclipse.releng.tools</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.sdk.examples/pom.xml b/bundles/org.eclipse.sdk.examples/pom.xml
index 5b299e85..4b522e59 100644
--- a/bundles/org.eclipse.sdk.examples/pom.xml
+++ b/bundles/org.eclipse.sdk.examples/pom.xml
@@ -27,4 +27,43 @@
   <version>3.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <format>'v${maven.build.timestamp}'</format>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>update-branding-plugins</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <configuration>
+                  <tasks>
+                    <replace file="about.mappings" 
+                             token="@build@" value="${buildId}" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/bundles/org.eclipse.sdk.tests/pom.xml b/bundles/org.eclipse.sdk.tests/pom.xml
index aa2b3371..e2db68f8 100644
--- a/bundles/org.eclipse.sdk.tests/pom.xml
+++ b/bundles/org.eclipse.sdk.tests/pom.xml
@@ -27,4 +27,43 @@
   <version>4.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <format>'v${maven.build.timestamp}'</format>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>update-branding-plugins</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <configuration>
+                  <tasks>
+                    <replace file="about.mappings" 
+                             token="@build@" value="${buildId}" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/features/master-equinox/pom.xml b/features/master-equinox/pom.xml
index c6a459f3..a955ba64 100644
--- a/features/master-equinox/pom.xml
+++ b/features/master-equinox/pom.xml
@@ -33,7 +33,15 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
-          <executionEnvironment>J2SE-1.5</executionEnvironment>
+          <dependency-resolution> 
+            <extraRequirements> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.apache.commons.logging</id> 
+                <versionRange>[1.0,1.1)</versionRange> 
+              </requirement> 
+            </extraRequirements> 
+          </dependency-resolution> 
         </configuration>
       </plugin>
       <plugin>
diff --git a/features/master/pom.xml b/features/master/pom.xml
index df6e51e1..02e13164 100644
--- a/features/master/pom.xml
+++ b/features/master/pom.xml
@@ -26,5 +26,4 @@
   <artifactId>master</artifactId>
   <version>3.4.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-
 </project>
diff --git a/features/org.eclipse.help-feature/pom.xml b/features/org.eclipse.help-feature/pom.xml
index 0eff0278..203c2d3b 100644
--- a/features/org.eclipse.help-feature/pom.xml
+++ b/features/org.eclipse.help-feature/pom.xml
@@ -24,11 +24,36 @@
 
   <groupId>org.eclipse.cvs-feature</groupId>
   <artifactId>org.eclipse.help</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
     <plugins>
+      <plugin> 
+        <groupId>org.eclipse.tycho</groupId> 
+        <artifactId>target-platform-configuration</artifactId> 
+        <configuration> 
+          <dependency-resolution> 
+            <extraRequirements> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.apache.lucene</id> 
+                <versionRange>[2.9,3.0)</versionRange> 
+              </requirement>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.apache.lucene.analysis</id>
+                <versionRange>[2.9,3.0)</versionRange>
+              </requirement>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.apache.commons.logging</id>
+                <versionRange>[1.0,1.1)</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho.extras</groupId>
         <artifactId>tycho-source-feature-plugin</artifactId>
diff --git a/features/org.eclipse.platform-feature/pom.xml b/features/org.eclipse.platform-feature/pom.xml
index 6d351867..8e6cadc4 100644
--- a/features/org.eclipse.platform-feature/pom.xml
+++ b/features/org.eclipse.platform-feature/pom.xml
@@ -30,6 +30,22 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- this guarantees proper reactor build order  -->
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.eclipse.platform.doc.isv</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.eclipse.tycho.extras</groupId>
         <artifactId>tycho-source-feature-plugin</artifactId>
         <executions>
@@ -40,6 +56,9 @@
               <goal>source-feature</goal>
             </goals>
             <configuration>
+              <plugins>
+                <plugin id="org.eclipse.platform.doc.isv" versionRange="0.0.0" />
+              </plugins>
               <excludes>
                 <plugin id="org.eclipse.core.boot"/>
                 <plugin id="org.eclipse.platform.doc.user"/>
@@ -57,6 +76,11 @@
                 <plugin id="org.eclipse.core.resources.win32.x86"/>
                 <plugin id="org.eclipse.core.resources.win32.x86_64"/>
 
+                <plugin id="org.eclipse.core.net.linux.x86"/>
+                <plugin id="org.eclipse.core.net.linux.x86_64"/>
+                <plugin id="org.eclipse.core.net.win32.x86"/>
+                <plugin id="org.eclipse.core.net.win32.x86_64"/>
+
                 <plugin id="org.eclipse.update.core.linux"/>
                 <plugin id="org.eclipse.update.core.win32"/>
 
diff --git a/pom.xml b/pom.xml
index dbfeea14..1a53d941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../eclipse-parent</relativePath>
   </parent>
 
   <groupId>eclipse.platform.releng</groupId>
@@ -26,6 +27,12 @@
   <version>3.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+   <properties>
+     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git</tycho.scmUrl>
+   </properties>
+ 
+
+
   <modules>
     <module>bundles/org.eclipse.ant.optional.junit</module>
     <module>bundles/org.eclipse.cvs</module>
@@ -45,7 +52,6 @@
     <module>features/master-equinox-p2</module>
     <module>features/master-equinox-weaving</module>
     <module>features/master-jetty</module>
-    <module>features/com.ibm.icu.base</module>
     <module>features/org.eclipse.help-feature</module>
     <module>features/org.eclipse.license</module>
     <module>features/org.eclipse.pde.junit.runtime.addon</module>