From 59b91242b57459b03bad660e672266e31f191518 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hannu=20Niemist=C3=B6?= <hannu.niemisto@semantum.fi>
Date: Tue, 17 Jul 2018 15:11:17 +0300
Subject: [PATCH] Fixed target defintion references to 1.34.1

Change-Id: Ib5e62d908935727110d5ea78f8355ab442a53aa5
---
 .../simantics-desktop.product                 | 132 +++++++++---------
 ...imantics.sdk.build.targetdefinition.target |   2 +-
 ...g.simantics.sdk.build.targetdefinition.tpd |   2 +-
 .../simantics.target                          |   4 +-
 releng/org.simantics.sdk.repository/pom.xml   |   2 +-
 5 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
index b7df7f22e..66a77f650 100644
--- 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"?>
-<?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.0" 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>
+<?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
-      </programArgs>
+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
-      </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>
+-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 1fb0242ec..53bf1fb7b 100644
--- 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 72d6d75c5..652f0a40f 100644
--- 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 d3b0ff359..34df62006 100644
--- 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 3ca1d28a3..ed7f96f4b 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.34.0-SNAPSHOT</version>
+	<version>1.34.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<parent>
-- 
2.45.2