Merge "Bump master versions from 1.25.0 to 1.26.0."

diff --git a/bundles/org.simantics.modeling.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling.ui.workbench/META-INF/MANIFEST.MF
index e5a9cf6b1ca17a23130edfd28a5e337bbd164a01..5adc0cb6dd4ce199d1f26897bbfdf27fe20bb221 100644 (file)
--- a/bundles/org.simantics.modeling.ui.workbench/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling.ui.workbench/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: General Modeling Workbench Contributions
 Bundle-SymbolicName: org.simantics.modeling.ui.workbench;singleton:=true
-Bundle-Version: 1.25.0.qualifier
+Bundle-Version: 1.26.0.qualifier
 Bundle-Vendor: Semantum Oy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui

diff --git a/features/org.simantics.help.addons.feature/feature.xml b/features/org.simantics.help.addons.feature/feature.xml
index d9c4dc5d3bb63a449829b8cf9be6433ebe089d12..6ebc7ad2acab25a60e85a91249578b81459f2ed4 100644 (file)
--- a/features/org.simantics.help.addons.feature/feature.xml
+++ b/features/org.simantics.help.addons.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.help.addons"\r
       label="Simantics Help Add-on Features"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="Semantum Oy">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/features/org.simantics.modeling.ui.workbench.feature/feature.xml b/features/org.simantics.modeling.ui.workbench.feature/feature.xml
index 365429f26373eea0a8caabbe6abc9a46d908e21a..e0a54c026a6b6c3b20532a17dba1491487cafb61 100644 (file)
--- a/features/org.simantics.modeling.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.modeling.ui.workbench.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.modeling.ui.workbench.feature"\r
       label="Modeling Workbench Feature"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="Semantum Oy">\r
 \r
    <description>\r

diff --git a/features/org.simantics.platform.feature/feature.xml b/features/org.simantics.platform.feature/feature.xml
index 0ab47238e4f59ae5fe76f60ff4426a7633245e39..cd044b436f9aa580d77ec1537636a603532dc29f 100644 (file)
--- a/features/org.simantics.platform.feature/feature.xml
+++ b/features/org.simantics.platform.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.platform"\r
       label="Simantics Platform Base"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/features/org.simantics.platform.ui.feature/feature.xml b/features/org.simantics.platform.ui.feature/feature.xml
index 000aad2c7fb878784bcc02da0ac6cd91addb8b37..5d9020fc4c59736d0d335e457d990aef643a29ee 100644 (file)
--- a/features/org.simantics.platform.ui.feature/feature.xml
+++ b/features/org.simantics.platform.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.platform.ui"\r
       label="Simantics Platform UI Base"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description>\r

diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index c1f5b0a469308fcc6c57253146ce76c09cc1b4aa..d0b29dddc12b76b028d5e7ee531435e3a6a75403 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature\r
       id="org.simantics.sdk"\r
       label="Simantics SDK"\r
-      version="1.25.0"\r
+      version="1.26.0"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml
index 87b3ea7af5dbeee97085add6c4109ce5c677f5c3..9ee0afe4ea76624e72d05116802c06de86145818 100644 (file)
--- a/features/org.simantics.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.ui.workbench.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature\r
       id="org.simantics.ui.workbench"\r
       label="Simantics Workbench Basic UI"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml
index b81e2e567e8fd6337f569dc28878becdae467388..ec03fb6ce5defdf6bc7e80669d080d26a6995151 100644 (file)
--- a/features/org.simantics.utils.feature/feature.xml
+++ b/features/org.simantics.utils.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature\r
       id="org.simantics.utils"\r
       label="Simantics Platform Utilities"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/features/org.simantics.utils.ui.feature/feature.xml b/features/org.simantics.utils.ui.feature/feature.xml
index 6924e60acaa672050fa2ac1b029200b448579671..0a2504e14b2b916037baab1e611989f01e6403cf 100644 (file)
--- a/features/org.simantics.utils.ui.feature/feature.xml
+++ b/features/org.simantics.utils.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.utils.ui.feature"\r
       label="UI Utils Feature"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml
index 5569344e7ce964d83a336ed13a3cc10fbfdd9a3d..7e1408ea5c2ab84e75708a1567a77fe1a4b6ccce 100644 (file)
--- a/features/org.simantics.wiki.ui.feature/feature.xml
+++ b/features/org.simantics.wiki.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.wiki.ui.feature"\r
       label="Wiki Documentation Feature"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="Semantum Oy">\r
 \r
    <description url="http://www.example.com/description">\r

diff --git a/features/org.simantics.workbench.feature/feature.xml b/features/org.simantics.workbench.feature/feature.xml
index 4cbd8dcefe6b696d5ab4bb6edb5778d4d23b5ed6..7c84a304c7dfbe4236a7398f551d86d929e19ac4 100644 (file)
--- a/features/org.simantics.workbench.feature/feature.xml
+++ b/features/org.simantics.workbench.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature\r
       id="org.simantics.workbench"\r
       label="Simantics Workbench"\r
-      version="1.25.0.qualifier"\r
+      version="1.26.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland"\r
       plugin="org.simantics.workbench">\r
 \r

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index bdb30e190fa5388b9721553737c46c36eaf4de4c..828ae537ffa3a824aa06b79c7daa227257d0009a 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.simantics</groupId>
     <artifactId>org.simantics.sdk.build.p2.site</artifactId>
     <packaging>pom</packaging>
-    <version>1.25.0</version>
+    <version>1.26.0</version>
 
     <properties>
         <itext.version.actual>2.1.7.b1</itext.version.actual>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 07a30c2b9a4a1337a6a6956e646508f935135e8c..5587c81a7f33fe74a2eefcdfcf8e857bb7d0680c 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <?pde version="3.8"?>\r
-<target name="Simantics 1.25.0" sequenceNumber="11">\r
+<target name="Simantics 1.26.0" sequenceNumber="11">\r
 <locations>\r
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.simantics.sdk.feature.group" version="1.25.0"/>\r
-<unit id="org.simantics.sdk.source.feature.group" version="1.25.0"/>\r
+<unit id="org.simantics.sdk.feature.group" version="1.26.0"/>\r
+<unit id="org.simantics.sdk.source.feature.group" version="1.26.0"/>\r
 <repository location="http://www.simantics.org/download/master/sdk"/>\r
 </location>\r
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r

diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml
index 5731d5fd6f3f183a6c4e1f2d8d0cb535b4d1629c..af6b817ef24dbc20a8d7de840c1a5a82a05a7e97 100644 (file)
--- a/releng/org.simantics.sdk.repository/pom.xml
+++ b/releng/org.simantics.sdk.repository/pom.xml
@@ -2,7 +2,7 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>org.simantics.sdk.repository</artifactId>\r
-       <version>1.25.0-SNAPSHOT</version>\r
+       <version>1.26.0-SNAPSHOT</version>\r
        <packaging>eclipse-repository</packaging>\r
 \r
        <parent>\r