Bug 396094 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) for
equinox.bundles
diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml
index 440502d..f2dc4f4 100644
--- a/bundles/org.eclipse.equinox.bidi/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.bidi</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.equinox.console/pom.xml b/bundles/org.eclipse.equinox.console/pom.xml
index 175f3bb..c80e983 100644
--- a/bundles/org.eclipse.equinox.console/pom.xml
+++ b/bundles/org.eclipse.equinox.console/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.console</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.coordinator/pom.xml b/bundles/org.eclipse.equinox.coordinator/pom.xml
index 2320e0a..4ae46f6 100644
--- a/bundles/org.eclipse.equinox.coordinator/pom.xml
+++ b/bundles/org.eclipse.equinox.coordinator/pom.xml
@@ -22,6 +22,6 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.coordinator</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.ds.tests/pom.xml b/bundles/org.eclipse.equinox.ds.tests/pom.xml
index 02d0779..ba1e6bd 100644
--- a/bundles/org.eclipse.equinox.ds.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.ds.tests/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.ds.tests</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.ds/pom.xml b/bundles/org.eclipse.equinox.ds/pom.xml
index 0063f50..e84972c 100644
--- a/bundles/org.eclipse.equinox.ds/pom.xml
+++ b/bundles/org.eclipse.equinox.ds/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.ds</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.event/pom.xml b/bundles/org.eclipse.equinox.event/pom.xml
index f61e174..0123f29 100644
--- a/bundles/org.eclipse.equinox.event/pom.xml
+++ b/bundles/org.eclipse.equinox.event/pom.xml
@@ -22,7 +22,7 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.event</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.equinox.http.jetty8/pom.xml b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
index 82078ea..b6bd02e 100644
--- a/bundles/org.eclipse.equinox.http.jetty8/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.http.jetty</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.metatype/pom.xml b/bundles/org.eclipse.equinox.metatype/pom.xml
index f73ad6c..27c9cbf 100644
--- a/bundles/org.eclipse.equinox.metatype/pom.xml
+++ b/bundles/org.eclipse.equinox.metatype/pom.xml
@@ -22,7 +22,7 @@
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>org.eclipse.equinox.metatype</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.equinox.transforms.hook/pom.xml b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
index 47372c9..5c0b93c 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
@@ -23,4 +23,18 @@
<artifactId>org.eclipse.equinox.transforms.hook</artifactId>
<version>1.0.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <!-- workaround for build issue
+ Missing Constraint: Bundle-RequiredExecutionEnvironment: J2SE-1.5 -->
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/features/org.eclipse.equinox.core.feature/pom.xml b/features/org.eclipse.equinox.core.feature/pom.xml
index 1ab71c7..7ab076d 100644
--- a/features/org.eclipse.equinox.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.core.feature/pom.xml
@@ -25,4 +25,46 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-resources-win32.win32.x86</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <overwrite>true</overwrite>
+ <outputDirectory>${basedir}/executables/win32.win32.x86</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources-win32.win32.x86_64</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <overwrite>true</overwrite>
+ <outputDirectory>${basedir}/executables/win32.win32.x86_64</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
index 0f7693e..033a9c5 100644
--- a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
+++ b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
@@ -61,6 +61,44 @@
</environments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-resources-win32.win32.x86</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <overwrite>true</overwrite>
+ <outputDirectory>${basedir}/executables/win32.win32.x86</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources-win32.win32.x86_64</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <overwrite>true</overwrite>
+ <outputDirectory>${basedir}/executables/win32.win32.x86_64</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 67191e4..a3d51d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,10 @@
<version>3.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.bundles.git</tycho.scmUrl>
+ </properties>
+
<modules>
<module>bundles/org.eclipse.equinox.security.ui</module>
<module>features/org.eclipse.equinox.compendium.sdk</module>
