Fixed target defintion references to 1.34.1

Change-Id: Ib5e62d908935727110d5ea78f8355ab442a53aa5

diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
index b7df7f22e09e11b19442a176af9eadeb6644bc4e..66a77f650f7843fddfedbc9ead348f5127fb7822 100644 (file)
--- a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
+++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
@@ -1,76 +1,76 @@
-<?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.34.0" useFeatures="true" includeLaunchers="true">\r
-\r
-   <aboutInfo>\r
-      <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>\r
-      <text>\r
-         The desktop environment for Simantics products.\r
-      </text>\r
-   </aboutInfo>\r
-\r
-   <configIni use="">\r
-   </configIni>\r
-\r
-   <launcherArgs>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Simantics Desktop" uid="Simantics-Desktop" id="org.simantics.desktop.product.desktopProduct" application="org.simantics.workbench.application" version="1.34.1" useFeatures="true" includeLaunchers="true">
+
+   <aboutInfo>
+      <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>
+      <text>
+         The desktop environment for Simantics products.
+      </text>
+   </aboutInfo>
+
+   <configIni use="">
+   </configIni>
+
+   <launcherArgs>
       <programArgs>-fixerrors
 -data
 @noDefault
 -cssTheme
-org.eclipse.e4.ui.css.theme.e4_classic\r
-      </programArgs>\r
+org.eclipse.e4.ui.css.theme.e4_classic
+      </programArgs>
       <vmArgs>-ea
 -Xmx500M
 -Xshare:off
 -Dorg.simantics.workbench.application.showFastViewBars=false
 -Dorg.simantics.workbench.application.showPerspectiveBar=false
 -Dorg.simantics.workbench.application.excludePerspectiveFromTitle=true
--Declipse.workaround.bug467000=true\r
-      </vmArgs>\r
-      <vmArgsWin>-Dorg.osgi.framework.os.name=win32\r
-      </vmArgsWin>\r
-   </launcherArgs>\r
-\r
-   <windowImages i32="/org.simantics.desktop.ui/icons/simantics32.png"/>\r
-\r
-   <splash\r
-      location="org.simantics.desktop.product" />\r
-   <launcher name="Simantics-Desktop">\r
-      <win useIco="false">\r
-         <bmp/>\r
-      </win>\r
-   </launcher>\r
-\r
-\r
-   <vm>\r
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>\r
-   </vm>\r
-\r
-   <license>\r
-        <url>http://www.eclipse.org/legal/epl-v10.html</url>\r
-   </license>\r
-\r
-   <plugins>\r
-   </plugins>\r
-\r
-   <features>\r
-      <feature id="org.simantics.desktop.product.feature" version="1.0.0.qualifier"/>\r
-   </features>\r
-\r
-   <configurations>\r
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />\r
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />\r
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />\r
-   </configurations>\r
-\r
-   <preferencesInfo>\r
-      <targetfile overwrite="false"/>\r
-   </preferencesInfo>\r
-\r
-   <cssInfo>\r
-   </cssInfo>\r
-\r
-</product>\r
+-Declipse.workaround.bug467000=true
+      </vmArgs>
+      <vmArgsWin>-Dorg.osgi.framework.os.name=win32
+      </vmArgsWin>
+   </launcherArgs>
+
+   <windowImages i32="/org.simantics.desktop.ui/icons/simantics32.png"/>
+
+   <splash
+      location="org.simantics.desktop.product" />
+   <launcher name="Simantics-Desktop">
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+
+   <vm>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
+   </vm>
+
+   <license>
+        <url>http://www.eclipse.org/legal/epl-v10.html</url>
+   </license>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.simantics.desktop.product.feature" version="1.0.0.qualifier"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   </configurations>
+
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
+</product>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index 1fb0242ec239c39f5805257be43d9ad8abb2dd73..53bf1fb7ba563dfd1fe1b16c12dec8f7a83cd8e7 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -323,7 +323,7 @@
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.batik" version="1.8.0.201611220734"/>
       <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
-      <repository location="http://www.simantics.org/download/release/1.34.0/external-components/manual"/>
+      <repository location="http://www.simantics.org/download/release/1.34.1/external-components/manual"/>
     </location>
   </locations>
 </target>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
index 72d6d75c5a05de46ca27a0f9deeeb3ae911c200a..652f0a40f7d71cd9bcf17e1cbcdccad449dc621c 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
@@ -319,7 +319,7 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
        stax2-api.source
 }
 
-location "http://www.simantics.org/download/release/1.34.0/external-components/manual" {
+location "http://www.simantics.org/download/release/1.34.1/external-components/manual" {
        org.apache.batik
        org.apache.poi.feature.feature.group
 }

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index d3b0ff3597e5107a194bf8a6680d9ed706b3dc06..34df62006d7d29b364e445ffd80f20abccf7d335 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -318,12 +318,12 @@
       <unit id="org.supercsv.source" version="2.4.0"/>
       <unit id="stax2-api" version="3.1.4"/>
       <unit id="stax2-api.source" version="3.1.4"/>
-      <repository location="http://www.simantics.org/download/release/1.34.0/external-components/maven"/>
+      <repository location="http://www.simantics.org/download/release/1.34.1/external-components/maven"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.batik" version="1.8.0.201611220734"/>
       <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
-      <repository location="http://www.simantics.org/download/release/1.34.0/external-components/manual"/>
+      <repository location="http://www.simantics.org/download/release/1.34.1/external-components/manual"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.simantics.sdk.feature.group" version="0.0.0"/>

diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml
index 3ca1d28a33f672a0f69334136b708c754b152a55..ed7f96f4bf89dce0e283aa33043f7d28546ac6ed 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>
-       <version>1.34.0-SNAPSHOT</version>
+       <version>1.34.1-SNAPSHOT</version>
        <packaging>eclipse-repository</packaging>
 
        <parent>