From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 20 Dec 2016 06:16:54 +0000 (+0200)
Subject: Merge "Bump master versions from 1.25.0 to 1.26.0."
X-Git-Tag: v1.26.0~20
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=ada4db363b15212dbfa34953b03b2d9dbaafa8c6;hp=ad72696ec2077e61aff1cd7b1dea4aa913b3631b

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 e5a9cf6b1..5adc0cb6d 100644
--- 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 d9c4dc5d3..6ebc7ad2a 100644
--- a/features/org.simantics.help.addons.feature/feature.xml
+++ b/features/org.simantics.help.addons.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.help.addons"
       label="Simantics Help Add-on Features"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="Semantum Oy">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.simantics.modeling.ui.workbench.feature/feature.xml b/features/org.simantics.modeling.ui.workbench.feature/feature.xml
index 365429f26..e0a54c026 100644
--- 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
       id="org.simantics.modeling.ui.workbench.feature"
       label="Modeling Workbench Feature"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="Semantum Oy">
 
    <description>
diff --git a/features/org.simantics.platform.feature/feature.xml b/features/org.simantics.platform.feature/feature.xml
index 0ab47238e..cd044b436 100644
--- a/features/org.simantics.platform.feature/feature.xml
+++ b/features/org.simantics.platform.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.platform"
       label="Simantics Platform Base"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.simantics.platform.ui.feature/feature.xml b/features/org.simantics.platform.ui.feature/feature.xml
index 000aad2c7..5d9020fc4 100644
--- a/features/org.simantics.platform.ui.feature/feature.xml
+++ b/features/org.simantics.platform.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.platform.ui"
       label="Simantics Platform UI Base"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description>
diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index c1f5b0a46..d0b29dddc 100644
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.simantics.sdk"
       label="Simantics SDK"
-      version="1.25.0"
+      version="1.26.0"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml
index 87b3ea7af..9ee0afe4e 100644
--- a/features/org.simantics.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.ui.workbench.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.simantics.ui.workbench"
       label="Simantics Workbench Basic UI"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml
index b81e2e567..ec03fb6ce 100644
--- a/features/org.simantics.utils.feature/feature.xml
+++ b/features/org.simantics.utils.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.simantics.utils"
       label="Simantics Platform Utilities"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.simantics.utils.ui.feature/feature.xml b/features/org.simantics.utils.ui.feature/feature.xml
index 6924e60ac..0a2504e14 100644
--- a/features/org.simantics.utils.ui.feature/feature.xml
+++ b/features/org.simantics.utils.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.utils.ui.feature"
       label="UI Utils Feature"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml
index 5569344e7..7e1408ea5 100644
--- a/features/org.simantics.wiki.ui.feature/feature.xml
+++ b/features/org.simantics.wiki.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.wiki.ui.feature"
       label="Wiki Documentation Feature"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="Semantum Oy">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.simantics.workbench.feature/feature.xml b/features/org.simantics.workbench.feature/feature.xml
index 4cbd8dcef..7c84a304c 100644
--- a/features/org.simantics.workbench.feature/feature.xml
+++ b/features/org.simantics.workbench.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.simantics.workbench"
       label="Simantics Workbench"
-      version="1.25.0.qualifier"
+      version="1.26.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland"
       plugin="org.simantics.workbench">
 
diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index bdb30e190..828ae537f 100644
--- 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 07a30c2b9..5587c81a7 100644
--- 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"?>
 <?pde version="3.8"?>
-<target name="Simantics 1.25.0" sequenceNumber="11">
+<target name="Simantics 1.26.0" sequenceNumber="11">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.simantics.sdk.feature.group" version="1.25.0"/>
-<unit id="org.simantics.sdk.source.feature.group" version="1.25.0"/>
+<unit id="org.simantics.sdk.feature.group" version="1.26.0"/>
+<unit id="org.simantics.sdk.source.feature.group" version="1.26.0"/>
 <repository location="http://www.simantics.org/download/master/sdk"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml
index 5731d5fd6..af6b817ef 100644
--- 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">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.simantics.sdk.repository</artifactId>
-	<version>1.25.0-SNAPSHOT</version>
+	<version>1.26.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<parent>