Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.executable/pom.xml38
-rw-r--r--bundles/org.eclipse.equinox.launcher.carbon.macosx/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.s390/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.x86/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.aix.ppc/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.linux.x86/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.ia64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.x86/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher.wpf.win32.x86/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.launcher/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher/pom.xml6
-rw-r--r--bundles/org.eclipse.osgi.services/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.osgi.services/pom.xml7
-rw-r--r--bundles/org.eclipse.osgi.tests/.classpath4
-rw-r--r--bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi.tests/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.osgi.tests/pom.xml7
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java6
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java19
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java70
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java18
-rw-r--r--bundles/org.eclipse.osgi.util/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.osgi.util/pom.xml6
-rw-r--r--bundles/org.eclipse.osgi/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.osgi/pom.xml7
-rw-r--r--bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.osgi/supplement/pom.xml7
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java9
-rw-r--r--features/org.eclipse.equinox.core.sdk/forceQualifierUpdate.txt2
-rw-r--r--features/org.eclipse.equinox.core.sdk/pom.xml7
-rw-r--r--features/org.eclipse.equinox.executable.feature/build.properties2
-rw-r--r--features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt2
-rw-r--r--features/org.eclipse.equinox.executable.feature/pom.xml26
-rw-r--r--features/org.eclipse.equinox.executable.feature/resources/build.properties57
-rw-r--r--features/org.eclipse.equinox.executable.feature/resources/build.xml322
-rw-r--r--launcher-binary-parent/pom.xml13
-rw-r--r--pom.xml22
77 files changed, 674 insertions, 247 deletions
diff --git a/bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml
index 255b14849..8b1ae141b 100644
--- a/bundles/org.eclipse.equinox.executable/pom.xml
+++ b/bundles/org.eclipse.equinox.executable/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
@@ -45,7 +42,7 @@
<phase>generate-resources</phase>
<configuration>
<target>
- <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse" />
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
</target>
</configuration>
<goals>
@@ -98,7 +95,7 @@
<phase>generate-resources</phase>
<configuration>
<target>
- <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse" />
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
</target>
</configuration>
<goals>
@@ -151,7 +148,7 @@
<phase>generate-resources</phase>
<configuration>
<target>
- <ant antfile="build.xml" dir="library/win32/" target="build_eclipse" />
+ <ant antfile="build.xml" dir="library/win32/" target="build_eclipse"/>
</target>
</configuration>
<goals>
@@ -204,7 +201,7 @@
<phase>generate-resources</phase>
<configuration>
<target>
- <ant antfile="build.xml" dir="library/win32/" target="build_eclipse" />
+ <ant antfile="build.xml" dir="library/win32/" target="build_eclipse"/>
</target>
</configuration>
<goals>
@@ -257,7 +254,7 @@
<phase>generate-resources</phase>
<configuration>
<target>
- <ant antfile="build.xml" dir="library/carbon/" target="build_eclipse" />
+ <ant antfile="build.xml" dir="library/carbon/" target="build_eclipse"/>
</target>
</configuration>
<goals>
@@ -315,32 +312,29 @@
<!-- If local binaries had been built, copy will not overwrite
them -->
<copy todir="bin">
- <fileset
- dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
- <include name="**/*" />
+ <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+ <include name="**/*"/>
</fileset>
</copy>
<!-- Things below were copied from custombuildCallbacks.xml, as
Tycho does not support that -->
<copy includeEmptyDirs="false" todir="tempBin">
- <fileset dir="bin" />
+ <fileset dir="bin"/>
</copy>
- <delete dir="bin" />
+ <delete dir="bin"/>
<move todir="bin">
- <fileset dir="tempBin" />
+ <fileset dir="tempBin"/>
</move>
<!-- rename eclipse launchers to "launcher" -->
<move todir="bin" verbose="true">
- <fileset dir="bin" />
- <regexpmapper from="^(.*[/\\])eclipse(.exe)?$"
- to="\1launcher\2" />
+ <fileset dir="bin"/>
+ <regexpmapper from="^(.*[/\\])eclipse(.exe)?$" to="\1launcher\2"/>
</move>
<move todir="contributed" verbose="true">
- <fileset dir="contributed" />
- <regexpmapper from="^(.*[/\\])eclipse(.exe)?$"
- to="\1launcher\2" />
+ <fileset dir="contributed"/>
+ <regexpmapper from="^(.*[/\\])eclipse(.exe)?$" to="\1launcher\2"/>
</move>
</target>
</configuration>
diff --git a/bundles/org.eclipse.equinox.launcher.carbon.macosx/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.carbon.macosx/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.carbon.macosx/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml b/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml
index 59798c2e7..0b50ebaf5 100644
--- a/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
index 6c13d8197..87b4678aa 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml
index b26ca3623..af511bf7b 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
index da0168311..35443d1b9 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
index ab2bca992..1c41bf8d7 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml
index 85c329a68..f7b8c6f92 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
index 0035f0990..dda405138 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
index 5845e9a79..1fd834ee3 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
index 04ca84642..aabfd26f9 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
index d8389c66c..72b90e6b5 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
index 47c164708..3a374c724 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
index d8bc94314..d653e5733 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
index d25e28d5d..44b6b0bc9 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
index 578041d98..713e487f2 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
index 010077b39..9377d0717 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
index 220c7225d..b9c413610 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
index dfcbbe2d0..a050dd1b4 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
index a5617b389..b9a65be0c 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
index 2b25f1a08..0f210e53f 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
index e8c620768..b1badd9ad 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
index d3e17a36a..79d321fe2 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
index 6f51a6c44..1e8e9cd50 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
index de109b3a2..51950a42a 100644
--- a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.launcher/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher/pom.xml b/bundles/org.eclipse.equinox.launcher/pom.xml
index 443ba421f..659d33251 100644
--- a/bundles/org.eclipse.equinox.launcher/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.osgi.services/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi.services/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.osgi.services/pom.xml b/bundles/org.eclipse.osgi.services/pom.xml
index 3fea16b23..0df6bb0c0 100644
--- a/bundles/org.eclipse.osgi.services/pom.xml
+++ b/bundles/org.eclipse.osgi.services/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.osgi</groupId>
diff --git a/bundles/org.eclipse.osgi.tests/.classpath b/bundles/org.eclipse.osgi.tests/.classpath
index 0a20762af..48e23183d 100644
--- a/bundles/org.eclipse.osgi.tests/.classpath
+++ b/bundles/org.eclipse.osgi.tests/.classpath
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bundle_tests/test" path="bundles_src/test"/>
<classpathentry kind="src" output="bundle_tests/test2" path="bundles_src/test2"/>
@@ -104,7 +106,5 @@
<classpathentry kind="src" output="bundle_tests/test.bug306181b" path="bundles_src/test.bug306181b"/>
<classpathentry kind="src" output="bundle_tests/test.logging.a" path="bundles_src/test.logging.a"/>
<classpathentry kind="src" output="bundle_tests/geturl" path="bundles_src/geturl"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs
index 3ad8b2440..673621a6c 100644
--- a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Wed Feb 10 08:41:26 CST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -7,17 +6,23 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -26,7 +31,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -34,6 +40,7 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
@@ -41,7 +48,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
@@ -56,20 +65,33 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
@@ -89,9 +111,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -163,7 +186,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF
index 64a7849bd..6bc5a1b33 100644
--- a/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF
@@ -16,6 +16,6 @@ Bundle-Activator: org.eclipse.osgi.tests.OSGiTestsActivator
Import-Package: org.osgi.service.event; resolution:="optional"
Export-Package: org.eclipse.osgi.tests.bundles,
org.eclipse.osgi.tests.appadmin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
DynamicImport-Package: ext.framework.b
Eclipse-BundleShape: dir
diff --git a/bundles/org.eclipse.osgi.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi.tests/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.osgi.tests/pom.xml b/bundles/org.eclipse.osgi.tests/pom.xml
index ee0968365..1fb93b712 100644
--- a/bundles/org.eclipse.osgi.tests/pom.xml
+++ b/bundles/org.eclipse.osgi.tests/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.osgi</groupId>
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
index 563a8b859..bcd1b926c 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others All rights reserved. This
+ * Copyright (c) 2007, 2013 IBM Corporation and others 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
@@ -106,7 +106,7 @@ public class LogReaderServiceTest extends AbstractBundleTests {
// this is just a bundle that is harmless to start/stop
Bundle testBundle = installer.installBundle("test.logging.a"); //$NON-NLS-1$
- TestListener listener = new TestListener();
+ TestListener listener = new TestListener(testBundle);
reader.addLogListener(listener);
synchronized (listener) {
testBundle.start();
@@ -139,7 +139,7 @@ public class LogReaderServiceTest extends AbstractBundleTests {
public void testLogFrameworkEvent() throws Exception {
Bundle testBundle = installer.installBundle("test.logging.a"); //$NON-NLS-1$
- TestListener listener = new TestListener();
+ TestListener listener = new TestListener(testBundle);
reader.addLogListener(listener);
synchronized (listener) {
installer.refreshPackages(new Bundle[] {testBundle});
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java
index e176c7c3b..e4b2492a7 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java
@@ -1,22 +1,33 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation All rights reserved. This program
+ * Copyright (c) 2007, 2013 IBM Corporation 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
*******************************************************************************/
package org.eclipse.equinox.log.test;
-import junit.framework.Assert;
import org.eclipse.equinox.log.ExtendedLogEntry;
+import org.eclipse.osgi.tests.OSGiTestsActivator;
+import org.junit.Assert;
+import org.osgi.framework.Bundle;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogListener;
class TestListener implements LogListener {
+ private final Bundle testBundle;
LogEntry entry;
+ public TestListener() {
+ this(null);
+ }
+
+ public TestListener(Bundle testBundle) {
+ this.testBundle = testBundle == null ? OSGiTestsActivator.getContext().getBundle() : testBundle;
+ }
+
public synchronized void logged(LogEntry entry) {
- if (entry.getBundle().getBundleId() == 0)
- return; // discard logs from the logImpl in the framework
+ if (!testBundle.equals(entry.getBundle()))
+ return; // discard logs from all other bundles
this.entry = entry;
notifyAll();
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
index d880512d9..e1bf7d65c 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
@@ -39,7 +39,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle01() {
// simple test to create an embedded framework
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -81,7 +81,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle02() {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle02"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -127,7 +127,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle03() {
// create/stop/ test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle03"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -160,7 +160,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle04() {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle04"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -210,7 +210,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle05_1() {
// create/install/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle05_1"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -261,7 +261,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle05_2() {
// create/install/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle05_2"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -342,7 +342,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle06() {
// create multiple instances test
File config1 = OSGiTestsActivator.getContext().getDataFile("testSystemBundle06_1"); //$NON-NLS-1$
- Properties configuration1 = new Properties();
+ Map<String, Object> configuration1 = new HashMap<String, Object>();
configuration1.put(Constants.FRAMEWORK_STORAGE, config1.getAbsolutePath());
configuration1.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox1 = new Equinox(configuration1);
@@ -355,7 +355,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.STARTING, equinox1.getState()); //$NON-NLS-1$
File config2 = OSGiTestsActivator.getContext().getDataFile("testSystemBundle06_2"); //$NON-NLS-1$
- Properties configuration2 = new Properties();
+ Map<String, Object> configuration2 = new HashMap<String, Object>();
configuration2.put(Constants.FRAMEWORK_STORAGE, config2.getAbsolutePath());
configuration2.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox2 = new Equinox(configuration2);
@@ -419,7 +419,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle07() {
// test init twice
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle07_01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -477,7 +477,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle08() {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle08_1"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -501,7 +501,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.RESOLVED, equinox.getState()); //$NON-NLS-1$
config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle08_2"); //$NON-NLS-1$
- configuration = new Properties();
+ configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
equinox = new Equinox(configuration);
@@ -541,7 +541,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle09() {
// test FrameworkUtil.createFilter
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle09"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -579,7 +579,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle10() {
// create/start/update/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle10"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
final Equinox equinox = new Equinox(configuration);
@@ -645,7 +645,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle11() {
// test extra packages property
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle11"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "test.pkg1, test.pkg2"); //$NON-NLS-1$
@@ -686,7 +686,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle12() {
// Test stop FrameworkEvent
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle12"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -725,7 +725,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle13() {
// create/install/start/stop clean test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle13"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -773,7 +773,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.RESOLVED, equinox.getState()); //$NON-NLS-1$
// initialize the framework again to the same configuration
- configuration = new Properties();
+ configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
equinox = new Equinox(configuration);
@@ -800,7 +800,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.RESOLVED, equinox.getState()); //$NON-NLS-1$
// initialize the framework again to the same configuration but use clean option
- configuration = new Properties();
+ configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
@@ -830,7 +830,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle14() {
// Test startlevel property
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle14"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, "10"); //$NON-NLS-1$
@@ -866,7 +866,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle16() {
// test parent boot
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_BOOT);
@@ -876,7 +876,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle17() {
// test parent app
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_APP);
@@ -886,7 +886,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle18() {
// test parent ext
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_EXT);
@@ -896,14 +896,14 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle19() {
// test parent framework
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_FRAMEWORK);
checkParentClassLoader(configuration);
}
- private void checkParentClassLoader(Properties configuration) {
+ private void checkParentClassLoader(Map<String, Object> configuration) {
Equinox equinox = new Equinox(configuration);
try {
equinox.init();
@@ -923,7 +923,7 @@ public class SystemBundleTests extends AbstractBundleTests {
try {
Class activatorClazz = test.loadClass("substitutes.x.Ax"); //$NON-NLS-1$
ClassLoader parentCL = activatorClazz.getClassLoader().getParent();
- String configParent = configuration.getProperty(Constants.FRAMEWORK_BUNDLE_PARENT);
+ String configParent = (String) configuration.get(Constants.FRAMEWORK_BUNDLE_PARENT);
if (Constants.FRAMEWORK_BUNDLE_PARENT_APP.equals(configParent))
assertTrue("Wrong parent", parentCL == ClassLoader.getSystemClassLoader()); //$NON-NLS-1$
else if (Constants.FRAMEWORK_BUNDLE_PARENT_EXT.equals(configParent))
@@ -960,7 +960,7 @@ public class SystemBundleTests extends AbstractBundleTests {
private void doMRUBundleFileList(int limit) {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put("osgi.bundlefile.limit", Integer.toString(limit)); //$NON-NLS-1$//$NON-NLS-2$
@@ -1086,7 +1086,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testURLExternalFormat01() {
// create multiple instances test
File config1 = OSGiTestsActivator.getContext().getDataFile("testURLExternalFormat01_1"); //$NON-NLS-1$
- Properties configuration1 = new Properties();
+ Map<String, Object> configuration1 = new HashMap<String, Object>();
configuration1.put(Constants.FRAMEWORK_STORAGE, config1.getAbsolutePath());
configuration1.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox1 = new Equinox(configuration1);
@@ -1099,7 +1099,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.STARTING, equinox1.getState()); //$NON-NLS-1$
File config2 = OSGiTestsActivator.getContext().getDataFile("testURLExternalFormat01_2"); //$NON-NLS-1$
- Properties configuration2 = new Properties();
+ Map<String, Object> configuration2 = new HashMap<String, Object>();
configuration2.put(Constants.FRAMEWORK_STORAGE, config2.getAbsolutePath());
configuration2.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox2 = new Equinox(configuration2);
@@ -1189,7 +1189,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testURLMultiplexing01() throws BundleException {
// create multiple instances of Equinox to test
File config1 = OSGiTestsActivator.getContext().getDataFile(getName() + "_1");
- Properties configuration1 = new Properties();
+ Map<String, Object> configuration1 = new HashMap<String, Object>();
configuration1.put(Constants.FRAMEWORK_STORAGE, config1.getAbsolutePath());
configuration1.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox1 = new Equinox(configuration1);
@@ -1202,7 +1202,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.ACTIVE, equinox1.getState()); //$NON-NLS-1$
File config2 = OSGiTestsActivator.getContext().getDataFile(getName() + "_2"); //$NON-NLS-1$
- Properties configuration2 = new Properties();
+ Map<String, Object> configuration2 = new HashMap<String, Object>();
configuration2.put(Constants.FRAMEWORK_STORAGE, config2.getAbsolutePath());
configuration2.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox2 = new Equinox(configuration2);
@@ -1384,7 +1384,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testBug304213() {
// test installing bundle with empty manifest
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
@@ -1470,7 +1470,7 @@ public class SystemBundleTests extends AbstractBundleTests {
try {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put("osgi.dev", "../devCP");
@@ -1515,7 +1515,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testBug352275() {
// simple test to create an embedded framework
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
configuration.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "");
@@ -1555,7 +1555,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testWeavingPersistence() {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
Equinox equinox = new Equinox(configuration);
@@ -1699,7 +1699,7 @@ public class SystemBundleTests extends AbstractBundleTests {
private void doTestBug351519Refresh(Boolean refreshDuplicates) {
// Create a framework with equinox.refresh.duplicate.bsn=false configuration
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.framework", OSGiTestsActivator.getContext().getProperty("osgi.framework"));
if (refreshDuplicates != null)
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
index c03037c88..9fed1b29a 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
@@ -96,7 +96,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager01() {
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -132,7 +132,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager02() throws BundleException {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager02"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -183,7 +183,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager03() throws BundleException {
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager03"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -252,7 +252,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager04() throws BundleException {
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager04"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -322,7 +322,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager05() throws BundleException {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -372,7 +372,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testLocalization01() throws BundleException {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testLocalization01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -429,7 +429,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testBug254600() {
File config = OSGiTestsActivator.getContext().getDataFile("testBug254600"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -516,7 +516,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testBug287750() {
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -575,7 +575,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testBug367614() {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
diff --git a/bundles/org.eclipse.osgi.util/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi.util/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi.util/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.osgi.util/pom.xml b/bundles/org.eclipse.osgi.util/pom.xml
index 5b48fe429..cc97c1f98 100644
--- a/bundles/org.eclipse.osgi.util/pom.xml
+++ b/bundles/org.eclipse.osgi.util/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.osgi</groupId>
diff --git a/bundles/org.eclipse.osgi/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 823800f6f..29b275dd2 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.osgi</groupId>
diff --git a/bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml
index 42cf0e4b7..f07cee37a 100644
--- a/bundles/org.eclipse.osgi/supplement/pom.xml
+++ b/bundles/org.eclipse.osgi/supplement/pom.xml
@@ -9,16 +9,13 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
index 71fe5a28a..7c6c13ed7 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2013 IBM Corporation and others.
* 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
@@ -420,7 +420,10 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom
public synchronized void setFile(final File traceFile) {
this.outFile = traceFile;
- environmentInfo.setConfiguration(PROP_TRACEFILE, this.outFile.getAbsolutePath());
+ if (this.outFile != null)
+ environmentInfo.setConfiguration(PROP_TRACEFILE, this.outFile.getAbsolutePath());
+ else
+ environmentInfo.clearConfiguration(PROP_TRACEFILE);
// the file changed so start a new session
EclipseDebugTrace.newSession = true;
}
@@ -495,4 +498,4 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom
public void removedService(ServiceReference<DebugOptionsListener> reference, DebugOptionsListener service) {
context.ungetService(reference);
}
-} \ No newline at end of file
+}
diff --git a/features/org.eclipse.equinox.core.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.core.sdk/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/features/org.eclipse.equinox.core.sdk/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.core.sdk/pom.xml b/features/org.eclipse.equinox.core.sdk/pom.xml
index e1db6a09a..f7c82b9e1 100644
--- a/features/org.eclipse.equinox.core.sdk/pom.xml
+++ b/features/org.eclipse.equinox.core.sdk/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties
index 6d20955c1..989dc84f7 100644
--- a/features/org.eclipse.equinox.executable.feature/build.properties
+++ b/features/org.eclipse.equinox.executable.feature/build.properties
@@ -12,11 +12,9 @@
#custom = true
bin.includes = bin/,\
feature.xml,\
- target.build.properties,\
feature.properties,\
gtk_root/,\
motif_root/,\
- target.build.xml,\
eclipse_update_120.jpg,\
contributed/
diff --git a/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml
index 7200c4efb..3a8eb5074 100644
--- a/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/features/org.eclipse.equinox.executable.feature/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
@@ -25,6 +25,30 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>repack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- note that here we reference previously declared dependency -->
+ <unzip src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.directory}/tmp" />
+ <copy file="resources/build.properties" todir="${project.build.directory}/tmp"/>
+ <copy file="resources/build.xml" todir="${project.build.directory}/tmp"/>
+ <zip basedir="${project.build.directory}/tmp"
+ destfile="${project.build.directory}/${project.build.finalName}.jar" />
+ <!-- now the modified jar is available -->
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>1.0</version>
diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.properties b/features/org.eclipse.equinox.executable.feature/resources/build.properties
new file mode 100644
index 000000000..0f30a876d
--- /dev/null
+++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties
@@ -0,0 +1,57 @@
+###############################################################################
+# Copyright (c) 2000, 2010 IBM Corporation and others.
+# 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
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+custom = true
+
+####Even though marked as custom, the content of the build.properties needs to be updated to ensure correctness of RCP app exported
+root.permissions.755=${launcherName}
+
+root.win32.win32.x86=file:bin/win32/win32/x86/launcher.exe
+root.win32.win32.x86.permissions.755=launcher.exe
+root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe
+root.win32.win32.x86_64.permissions.755=launcher.exe
+
+root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
+root.linux.gtk.x86.permissions.755=launcher,libcairo-swt.so
+
+root.linux.gtk.ppc=bin/gtk/linux/ppc,gtk_root
+root.linux.gtk.ppc.permissions.755=launcher
+
+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
+root.linux.gtk.ppc64.permissions.755=launcher
+
+root.macosx.cocoa.x86=bin/cocoa/macosx/x86
+root.macosx.cocoa.x86.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
+
+root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
+root.macosx.cocoa.x86_64.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
+
+root.aix.gtk.ppc64=bin/gtk/aix/ppc64
+root.aix.gtk.ppc64.permissions.755=launcher
+root.aix.gtk.ppc=bin/gtk/aix/ppc
+root.aix.gtk.ppc.permissions.755=launcher
+
+root.hpux.gtk.ia64=bin/gtk/hpux/ia64
+root.hpux.gtk.ia64.permissions.755=launcher
+
+root.solaris.gtk.x86=bin/gtk/solaris/x86
+root.solaris.gtk.x86.permissions.755=launcher
+root.solaris.gtk.sparc=bin/gtk/solaris/sparc
+root.solaris.gtk.sparc.permissions.755=launcher
+
+root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
+root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
+
+root.linux.gtk.s390x=contributed/gtk/linux/s390x,gtk_root
+root.linux.gtk.s390x.permissions.755=launcher
+root.linux.gtk.s390=contributed/gtk/linux/s390,gtk_root
+root.linux.gtk.s390.permissions.755=launcher
+
diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml
new file mode 100644
index 000000000..cdded03fe
--- /dev/null
+++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.platform.launchers" default="build.update.jar" basedir=".">
+
+ <target name="init">
+ <property name="feature.destination" value="${basedir}"/>
+ <property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
+ <condition property="p2.publish.parts" value="true" >
+ <istrue value="${p2.gathering}"/>
+ </condition>
+ </target>
+
+ <target name="all.plugins" depends="init">
+ </target>
+ <target name="all.features" depends="init">
+ </target>
+ <target name="update.feature" depends="init">
+ </target>
+
+ <target name="all.children" depends="init,all.features,all.plugins,update.feature">
+ </target>
+
+ <target name="children" if="include.children">
+ <antcall target="all.children"/>
+ </target>
+
+ <target name="build.jars" depends="init" description="Build all the jars for the feature: org.eclipse.platform.launchers.">
+ </target>
+
+ <target name="build.sources" depends="init">
+ </target>
+
+ <target name="build.zips" depends="init">
+ </target>
+
+ <target name="build.update.jar" depends="init" description="Build the feature jar of: org.eclipse.platform.launchers for an update site.">
+ </target>
+
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+ <eclipse.gatherFeature
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${basedir}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="feature.base">
+ <subant target="rootFiles${os}_${ws}_${arch}" buildpath="." failonerror="false" inheritall="true"/>
+ </target>
+
+ <target name="rootFileswin32_win32_x86">
+ <mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/win32/win32/x86">
+ <include name="launcher.exe"/>
+ </fileset>
+ </copy>
+ <chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="launcher.exe" />
+ </target>
+
+ <target name="rootFileswin32_win32_x86_64">
+ <mkdir dir="${feature.base}/win32.win32.x86_64/${collectingFolder}"/>
+ <copy todir="${feature.base}/win32.win32.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/win32/win32/x86_64">
+ <include name="launcher.exe"/>
+ </fileset>
+ </copy>
+ <chmod perm="755" dir="${feature.base}/win32.win32.x86_64/${collectingFolder}" includes="launcher.exe" />
+ </target>
+
+ <target name="rootFileswin32_win32_ia64">
+ <mkdir dir="${feature.base}/win32.win32.ia64/${collectingFolder}"/>
+ <copy todir="${feature.base}/win32.win32.ia64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/contributed/win32/win32/ia64">
+ <include name="launcher.exe"/>
+ </fileset>
+ </copy>
+ <chmod perm="755" dir="${feature.base}/win32.win32.ia64/${collectingFolder}" includes="launcher.exe" />
+ </target>
+
+ <target name="rootFileswin32_wpf_x86">
+ <mkdir dir="${feature.base}/win32.wpf.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/win32.wpf.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/wpf/win32/x86">
+ <include name="launcher.exe"/>
+ </fileset>
+ </copy>
+ <chmod perm="755" dir="${feature.base}/win32.wpf.x86/${collectingFolder}" includes="launcher.exe" />
+ </target>
+
+ <target name="rootFilesmacosx_carbon_ppc">
+ <mkdir dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}"/>
+ <copy todir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/carbon/macosx/ppc" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="${launcherName}" />
+ <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
+ </target>
+ <target name="rootFilesmacosx_carbon_x86">
+ <mkdir dir="${feature.base}/macosx.carbon.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/macosx.carbon.x86/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/carbon/macosx/x86" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}" />
+ <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
+ </target>
+ <target name="rootFilesmacosx_cocoa_ppc">
+ <mkdir dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}"/>
+ <copy todir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/cocoa/macosx/ppc" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="${launcherName}" />
+ <chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
+ </target>
+ <target name="rootFilesmacosx_cocoa_x86">
+ <mkdir dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/cocoa/macosx/x86" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="${launcherName}" />
+ <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
+ </target>
+ <target name="rootFilesmacosx_cocoa_x86_64">
+ <mkdir dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}"/>
+ <copy todir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/cocoa/macosx/x86_64" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" />
+ <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
+ </target>
+ <target name="rootFileslinux_gtk_x86">
+ <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/linux/x86" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileslinux_gtk_ppc">
+ <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/linux/ppc" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileslinux_gtk_ppc64">
+ <mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/linux/ppc64" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilesaix_gtk_ppc64">
+ <mkdir dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}"/>
+ <copy todir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/aix/ppc64" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilesaix_gtk_ppc">
+ <mkdir dir="${feature.base}/aix.gtk.ppc/${collectingFolder}"/>
+ <copy todir="${feature.base}/aix.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/aix/ppc" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/aix.gtk.ppc/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileslinux_gtk_x86_64">
+ <mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/linux/x86_64" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileslinux_gtk_ia64">
+ <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true">
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileslinux_gtk_s390x">
+ <mkdir dir="${feature.base}/linux.gtk.s390x/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.s390x/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/contributed/gtk/linux/s390x" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileslinux_gtk_s390">
+ <mkdir dir="${feature.base}/linux.gtk.s390/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.s390/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/contributed/gtk/linux/s390" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileslinux_motif_x86">
+ <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/motif/linux/x86" includes="**" />
+ <fileset dir="${basedir}/motif_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="libXm.so.2" />
+ <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilessolaris_gtk_sparc">
+ <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}"/>
+ <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/solaris/sparc" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilessolaris_gtk_x86">
+ <mkdir dir="${feature.base}/solaris.gtk.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/solaris.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/solaris/x86" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilessolaris_motif_sparc">
+ <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>
+ <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/contributed/motif/solaris/sparc" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilesaix_motif_ppc">
+ <mkdir dir="${feature.base}/aix.motif.ppc/${collectingFolder}"/>
+ <copy todir="${feature.base}/aix.motif.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/motif/aix/ppc" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileshpux_motif_PA_RISC">
+ <mkdir dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}"/>
+ <copy todir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/motif/hpux/PA_RISC" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileshpux_motif_ia64">
+ <mkdir dir="${feature.base}/hpux.motif.ia64/${collectingFolder}"/>
+ <copy todir="${feature.base}/hpux.motif.ia64/${collectingFolder}" failonerror="true" overwrite="true">
+ </copy>
+ <chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileshpux_motif_ia64_32">
+ <mkdir dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}"/>
+ <copy todir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/motif/hpux/ia64_32" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFileshpux_gtk_ia64_32">
+ <mkdir dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}"/>
+ <copy todir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/hpux/ia64_32" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilesqnx_photon_x86">
+ <mkdir dir="${feature.base}/qnx.photon.x86/${collectingFolder}"/>
+ <copy todir="${feature.base}/qnx.photon.x86/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/photon/qnx/x86" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="launcher" />
+ </target>
+ <target name="rootFilesgroup_group_group">
+ <antcall target="rootFileswin32_win32_x86"/>
+ <antcall target="rootFileswin32_wpf_x86"/>
+ <antcall target="rootFileswin32_win32_x86_64"/>
+ <antcall target="rootFileswin32_win32_ia64"/>
+ <antcall target="rootFilesmacosx_carbon_ppc"/>
+ <antcall target="rootFilesmacosx_carbon_x86"/>
+ <antcall target="rootFilesmacosx_cocoa_ppc"/>
+ <antcall target="rootFilesmacosx_cocoa_x86"/>
+ <antcall target="rootFileslinux_gtk_x86"/>
+ <antcall target="rootFileslinux_gtk_ppc"/>
+ <antcall target="rootFileslinux_gtk_ppc64"/>
+ <antcall target="rootFileslinux_gtk_x86_64"/>
+ <antcall target="rootFileslinux_gtk_ia64"/>
+ <antcall target="rootFileslinux_gtk_s390x"/>
+ <antcall target="rootFileslinux_motif_x86"/>
+ <antcall target="rootFilessolaris_gtk_sparc"/>
+ <antcall target="rootFilessolaris_gtk_x86"/>
+ <antcall target="rootFilessolaris_motif_sparc"/>
+ <antcall target="rootFilesaix_motif_ppc"/>
+ <antcall target="rootFilesaix_gtk_ppc64"/>
+ <antcall target="rootFilesaix_gtk_ppc"/>
+ <antcall target="rootFileshpux_motif_PA_RISC"/>
+ <antcall target="rootFileshpux_motif_ia64"/>
+ <antcall target="rootFileshpux_motif_ia64_32"/>
+ <antcall target="rootFileshpux_gtk_ia64_32"/>
+ <antcall target="rootFilesqnx_photon_x86"/>
+ </target>
+
+ <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform.launchers.">
+ </target>
+
+ <target name="zip.sources" depends="init">
+ </target>
+
+ <target name="zip.logs" depends="init">
+ </target>
+
+ <target name="clean" depends="init" description="Clean the feature: org.eclipse.platform.launchers of all the zips, jars and logs created.">
+ </target>
+
+ <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+ </target>
+
+ <target name="gather.sources">
+ </target>
+
+ <target name="gather.logs" depends="init">
+ </target>
+
+</project> \ No newline at end of file
diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml
index 1114aebea..278a6e430 100644
--- a/launcher-binary-parent/pom.xml
+++ b/launcher-binary-parent/pom.xml
@@ -9,16 +9,13 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.equinox.framework</groupId>
<artifactId>rt.equinox.framework</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>launcher-binary-parent</artifactId>
@@ -53,12 +50,12 @@
<id>copy-launcher-natives</id>
<phase>process-resources</phase>
<configuration>
- <property name="feature.base" value="." />
+ <property name="feature.base" value="."/>
<target>
<copy todir="." overwrite="true">
<fileset dir="../../../rt.equinox.binaries/${project.artifactId}/">
- <include name="*.so" />
- <include name="*.dll" />
+ <include name="*.so"/>
+ <include name="*.dll"/>
</fileset>
</copy>
</target>
diff --git a/pom.xml b/pom.xml
index 59bc974df..b46cdc63b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,28 +9,38 @@
Contributors:
Igor Fedorenko - initial implementation
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox.framework</groupId>
<artifactId>rt.equinox.framework</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git</tycho.scmUrl>
</properties>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>eclipse-hosted</id>
+ <url>https://repo.eclipse.org/content/repositories/eclipse/</url>
+ </repository>
+ </repositories>
+
<modules>
<module>bundles/org.eclipse.osgi</module>
<module>bundles/org.eclipse.osgi.services</module>

Back to the top