Bumped master target, org.simantics.sdk and desktop versions to 1.34.0

refs #7788

Change-Id: I979284151c186c678d4219a3a810a23727caacfb

diff --git a/bundles/org.simantics.desktop.product/splash.bmp b/bundles/org.simantics.desktop.product/splash.bmp
index e81ae0778c19cfe5490891d004ec869f4fd427f5..7ea75faf19fa8b7b4dccea6a61fbe0358da11958 100644 (file)
Binary files a/bundles/org.simantics.desktop.product/splash.bmp and b/bundles/org.simantics.desktop.product/splash.bmp differ

diff --git a/bundles/org.simantics.desktop.product/splash.svg b/bundles/org.simantics.desktop.product/splash.svg
index 593383b060d1812bd69616ff7d18106acfcbafda..96f83cf93d61bc9f9cc42d638e8eccae40d7c350 100644 (file)
--- a/bundles/org.simantics.desktop.product/splash.svg
+++ b/bundles/org.simantics.desktop.product/splash.svg
@@ -328,7 +328,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2"

-     inkscape:cx="-41.530486"
+     inkscape:cx="-140.03049"

      inkscape:cy="114.00348"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:cy="114.00348"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"


@@ -336,9 +336,9 @@
      units="px"
      showborder="true"
      inkscape:showpageshadow="false"
      units="px"
      showborder="true"
      inkscape:showpageshadow="false"

-     inkscape:window-width="2880"
-     inkscape:window-height="1706"
-     inkscape:window-x="5749"
+     inkscape:window-width="3840"
+     inkscape:window-height="2066"
+     inkscape:window-x="-11"

      inkscape:window-y="-11"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:window-y="-11"
      inkscape:window-maximized="1"
      showguides="true"


@@ -401,7 +401,7 @@
          id="tspan6235"
          x="4.0821486"
          y="291.79337"
          id="tspan6235"
          x="4.0821486"
          y="291.79337"

-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:'The Real Font';-inkscape-font-specification:'The Real Font';fill:#ffffff;fill-opacity:1;stroke-width:0.26458335px">1.33.0</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:'The Real Font';-inkscape-font-specification:'The Real Font';fill:#ffffff;fill-opacity:1;stroke-width:0.26458335px">1.34.0</tspan></text>

     <circle
        style="opacity:0.92900002;fill:#5d6b91;fill-opacity:1;stroke:none;stroke-width:1.27400005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6809)"
        id="path6231"
     <circle
        style="opacity:0.92900002;fill:#5d6b91;fill-opacity:1;stroke:none;stroke-width:1.27400005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6809)"
        id="path6231"

diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index d59a8a7c4c9459ed96ec627e41d65482ec08c250..5aeb671c855c366e4d55a4b1487c068ba283614b 100644 (file)
--- 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"
 <feature
       id="org.simantics.sdk"
       label="Simantics SDK"

-      version="1.33.0.qualifier"
+      version="1.34.0.qualifier"

       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">
       provider-name="VTT Technical Research Centre of Finland">
 
    <description url="http://www.example.com/description">

diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
index c3eccef5ad7de0cddf65d13eaaac3716c57a298f..b7df7f22e09e11b19442a176af9eadeb6644bc4e 100644 (file)
--- a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
+++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r

-<product name="Simantics Desktop" uid="Simantics-Desktop" id="org.simantics.desktop.product.desktopProduct" application="org.simantics.workbench.application" version="1.31.0" useFeatures="true" includeLaunchers="true">\r
+<product name="Simantics Desktop" uid="Simantics-Desktop" id="org.simantics.desktop.product.desktopProduct" application="org.simantics.workbench.application" version="1.34.0" useFeatures="true" includeLaunchers="true">\r

 \r
    <aboutInfo>\r
       <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>\r
 \r
    <aboutInfo>\r
       <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>\r

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 51114de9d44ff02f163ce29f20fea4da68564d8b..bc6b354ebca42ba17b035fbfb3cbee73c57f1d1c 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <?pde?>\r
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->\r
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <?pde?>\r
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->\r

-<target name="Simantics 1.33.0" sequenceNumber="1515415255">\r
+<target name="Simantics 1.34.0" sequenceNumber="1519764726">\r

   <locations>\r
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>\r
   <locations>\r
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>\r

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
index e535f9a49f53ebd7ac33db7cae2d2ec4e2e8639b..56b797bb5289b6fc68e04794ee0ad3ad7e8901b8 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
@@ -1,4 +1,4 @@
-target "Simantics 1.33.0"
+target "Simantics 1.34.0"

 
 with source allEnvironments
 
 
 with source allEnvironments
 

diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml
index babecf993fe72a19e41f145e133cffd7838f3f15..3ca1d28a33f672a0f69334136b708c754b152a55 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">
        <modelVersion>4.0.0</modelVersion>
        <artifactId>org.simantics.sdk.repository</artifactId>
        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.33.0-SNAPSHOT</version>
+       <version>1.34.0-SNAPSHOT</version>

        <packaging>eclipse-repository</packaging>
 
        <parent>
        <packaging>eclipse-repository</packaging>
 
        <parent>