Merge branch 'master' into master_juno
diff --git a/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
index afdf73c..6af706d 100644
--- a/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
@@ -7,17 +7,17 @@
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.vex.core;bundle-version="[1.1.0,2.0.0)",
org.apache.xerces;bundle-version="2.9.0",
- org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.8.0,4.0.0)",
org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)",
- org.junit;bundle-version="4.11.0",
- com.ibm.icu;bundle-version="50.1.1"
+ org.junit;bundle-version="4.10.0",
+ com.ibm.icu;bundle-version="[1.0.0,100.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.vex.core.internal.css;x-internal:=true,
diff --git a/org.eclipse.vex.core/META-INF/MANIFEST.MF b/org.eclipse.vex.core/META-INF/MANIFEST.MF
index a5b5143..06d0fc4 100644
--- a/org.eclipse.vex.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.core/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.vex.core;singleton:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.9.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.8.0,4.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.dtd.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)",
@@ -13,7 +13,7 @@
org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
org.apache.batik.css;bundle-version="1.7.0",
org.apache.batik.util;bundle-version="1.7.0",
- org.eclipse.xsd;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.xsd;bundle-version="[2.8.0,3.0.0)",
org.eclipse.jface.text;bundle-version="[3.8.0,4.0.0)"
Export-Package: org.eclipse.vex.core,
org.eclipse.vex.core.internal;x-friends:="org.eclipse.vex.ui,org.eclipse.vex.core.tests",
diff --git a/org.eclipse.vex.docbook/META-INF/MANIFEST.MF b/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
index 0ac0bc4..1d075fb 100644
--- a/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.vex.docbook;singleton:=true
Require-Bundle: org.eclipse.vex.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.vex.ui,
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.vex.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)"
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.vex.releng/Build All Vex.launch b/org.eclipse.vex.releng/Build All Vex.launch
index edb0549..27e05c2 100644
--- a/org.eclipse.vex.releng/Build All Vex.launch
+++ b/org.eclipse.vex.releng/Build All Vex.launch
@@ -7,11 +7,12 @@
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="application=org.eclipse.tycho.surefire.osgibooter.headlesstest"/>
-<listEntry value="milestone=M1"/>
+<listEntry value="milestone=M3"/>
<listEntry value="build-type=ci"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.vex.releng}"/>
diff --git a/org.eclipse.vex.releng/pom.xml b/org.eclipse.vex.releng/pom.xml
index 578a437..2922b8a 100644
--- a/org.eclipse.vex.releng/pom.xml
+++ b/org.eclipse.vex.releng/pom.xml
@@ -54,8 +54,8 @@
<repositories>
<repository>
- <id>kepler</id>
- <url>http://download.eclipse.org/releases/kepler/</url>
+ <id>juno</id>
+ <url>http://download.eclipse.org/releases/juno/</url>
<layout>p2</layout>
</repository>
<repository>
diff --git a/org.eclipse.vex.releng/vex.target b/org.eclipse.vex.releng/vex.target
index be0f257..0d96813 100644
--- a/org.eclipse.vex.releng/vex.target
+++ b/org.eclipse.vex.releng/vex.target
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Vex (based on Kepler)" sequenceNumber="31">
+<?pde version="3.8"?><target name="Vex (based on Juno)" sequenceNumber="34">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.3.0.I20130605-2000"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.3"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="3.9.0.v20130605-2000"/>
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.5.0.v201301022000-7H7IFisDxumVt037ridXmVSgs8DdRZKtSyS6PL"/>
-<repository location="http://download.eclipse.org/releases/kepler"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.batik.css" version="1.7.0.v201011041433"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="3.8.2.M20130131-0800"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.2.v201211061806-7H7GFeJDxumUrsn5qkiQgOEhsz0p60HAmPyU6VX"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.8.2.v20130116-090414-8-8nFu3FNOfwKLRuqgXKIy9z0I83"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
</target>
diff --git a/org.eclipse.vex.repository/category.xml b/org.eclipse.vex.repository/category.xml
index 626fcc3..8a0c5af 100644
--- a/org.eclipse.vex.repository/category.xml
+++ b/org.eclipse.vex.repository/category.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description>
- Visual Editor for XML
- </description>
- <feature url="features/org.eclipse.vex.feature_1.1.0.qualifier.jar" id="org.eclipse.vex.feature" version="1.1.0.qualifier">
- <category name="vex_core"/>
- </feature>
- <feature url="features/org.eclipse.vex.sdk.feature_1.1.0.qualifier.jar" id="org.eclipse.vex.sdk.feature" version="1.1.0.qualifier">
- <category name="vex_core"/>
- </feature>
- <category-def name="vex_core" label="Visual Editor for XML">
- <description>
- The Vex XML editor for document-style XML documents, including support for XHTML, DocBook and DITA.
- </description>
- </category-def>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>
+ Visual Editor for XML
+ </description>
+ <feature url="features/org.eclipse.vex.feature_1.1.0.qualifier.jar" id="org.eclipse.vex.feature" version="1.1.0.qualifier">
+ <category name="vex_core_juno"/>
+ </feature>
+ <feature url="features/org.eclipse.vex.sdk.feature_1.1.0.qualifier.jar" id="org.eclipse.vex.sdk.feature" version="1.1.0.qualifier">
+ <category name="vex_core_juno"/>
+ </feature>
+ <category-def name="vex_core_juno" label="Visual Editor for XML (based on Juno)">
+ <description>
+ The Vex XML editor for document-style XML documents, including support for XHTML, DocBook and DITA.
+ </description>
+ </category-def>
+</site>
diff --git a/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
index 47dca87..6166a7a 100644
--- a/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@
Require-Bundle: org.eclipse.vex.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.vex.core.tests;bundle-version="[1.1.0,2.0.0)",
org.eclipse.vex.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.8.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.8.0,4.0.0)",
org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
- org.junit;bundle-version="4.11.0"
+ org.junit;bundle-version="4.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
Bundle-ClassPath: .
diff --git a/org.eclipse.vex.ui/META-INF/MANIFEST.MF b/org.eclipse.vex.ui/META-INF/MANIFEST.MF
index 6f8ce84..7f40d73 100644
--- a/org.eclipse.vex.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.ui/META-INF/MANIFEST.MF
@@ -6,12 +6,12 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.vex.ui;singleton:=true
Require-Bundle: org.eclipse.vex.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.8.0,4.0.0)",
org.eclipse.ui.views;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.8.0,4.0.0)",
org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
org.eclipse.jface.text;bundle-version="[3.8.0,4.0.0)",
@@ -19,7 +19,7 @@
org.eclipse.wst.sse.ui;bundle-version="[1.3.0,2.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.xml.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
Export-Package: org.eclipse.vex.ui.internal;x-friends:="org.eclipse.vex.ui.tests",
diff --git a/org.eclipse.vex.xhtml/META-INF/MANIFEST.MF b/org.eclipse.vex.xhtml/META-INF/MANIFEST.MF
index f685be0..15a6c73 100644
--- a/org.eclipse.vex.xhtml/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.xhtml/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.vex.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.vex.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.8.0,4.0.0)",
org.eclipse.wst.standard.schemas;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
