Bug 396111 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) for eclipse.platform.uav20121210-193220I20121214-0730I20121213-1200I20121212-2000I20121212-0800I20121211-2000I20121211-0800I20121210-2000

6 files changed, 78 insertions, 21 deletions

diff --git a/org.eclipse.help.base/pom.xml b/org.eclipse.help.base/pom.xml
index 3b3a5824a..fb68b161e 100644
--- a/org.eclipse.help.base/pom.xml
+++ b/org.eclipse.help.base/pom.xml
@@ -20,31 +20,46 @@
   </parent>
   <groupId>eclipse.platform.ua</groupId>
   <artifactId>org.eclipse.help.base</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho.version}</version>
         <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>
-            </extraRequirements>
-          </dependency-resolution>
+          <format>'v${maven.build.timestamp}'</format>
         </configuration>
       </plugin>
     </plugins>
-  </build> 
+  </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/org.eclipse.help.ui/pom.xml b/org.eclipse.help.ui/pom.xml
index f3143f74d..ab6d464bd 100644
--- a/org.eclipse.help.ui/pom.xml
+++ b/org.eclipse.help.ui/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.platform.ua</groupId>
   <artifactId>org.eclipse.help.ui</artifactId>
-  <version>3.5.200-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.help.webapp/pom.xml b/org.eclipse.help.webapp/pom.xml
index f14902bea..458a12c6b 100644
--- a/org.eclipse.help.webapp/pom.xml
+++ b/org.eclipse.help.webapp/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.platform.ua</groupId>
   <artifactId>org.eclipse.help.webapp</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.6.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.help/pom.xml b/org.eclipse.help/pom.xml
index 68a4c5d2e..e49a2a666 100644
--- a/org.eclipse.help/pom.xml
+++ b/org.eclipse.help/pom.xml
@@ -23,4 +23,16 @@
   <artifactId>org.eclipse.help</artifactId>
   <version>3.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!-- observed BREE as of Juno -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/org.eclipse.ua.tests/pom.xml b/org.eclipse.ua.tests/pom.xml
index bfde6ed69..41cb1d98a 100644
--- a/org.eclipse.ua.tests/pom.xml
+++ b/org.eclipse.ua.tests/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.platform.ua</groupId>
   <artifactId>org.eclipse.ua.tests</artifactId>
-  <version>3.3.500-SNAPSHOT</version>
+  <version>3.3.600-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index 819ac476d..a6a7cc7d0 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.ua</groupId>
@@ -26,9 +27,12 @@
   <version>3.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <properties>
+    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.ua.git</tycho.scmUrl>
+  </properties>
+
   <modules>
     <module>org.eclipse.help</module>
-    <module>org.eclipse.help.appserver</module>
     <module>org.eclipse.help.base</module>
     <module>org.eclipse.help.ui</module>
     <module>org.eclipse.help.webapp</module>
@@ -38,4 +42,30 @@
     <module>org.eclipse.ui.intro</module>
     <module>org.eclipse.ui.intro.universal</module>
   </modules>
+
+  <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>[3.5,4.0)</versionRange>
+              </requirement>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.apache.lucene.analysis</id>
+                <versionRange>[3.5,4.0)</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build> 
+
 </project>