From 92f850a1a57b6156e92cbb405f29c9a0ecba2b9b Mon Sep 17 00:00:00 2001
From: Miro Richard Eklund <miro.eklund@semantum.fi>
Date: Fri, 2 Nov 2018 14:46:24 +0200
Subject: [PATCH] Add zeroturnaround to p2 site build's pom.xml

Simantics p2 site now includes org.zeroturnaround:zt-exec
Added .target and .tpd definitions

gitlab #176
closes #176

Change-Id: I254712ce6cbed2d258cb6eb19f1d1b9882a87ad5
---
 releng/org.simantics.sdk.build.p2.site/pom.xml               | 5 +++++
 .../org.simantics.sdk.build.targetdefinition.target          | 4 +++-
 .../org.simantics.sdk.build.targetdefinition.tpd             | 2 ++
 .../simantics.target                                         | 4 +++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 1001743be..5d63b4d00 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -25,6 +25,7 @@
         <grpc.version>1.14.0</grpc.version>
         <grpc.version.actual>1.14.0.b007</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
+        <zeroturnaround.version>1.10</zeroturnaround.version>
     </properties>
 
     <repositories>
@@ -470,6 +471,10 @@
                                     <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.zeroturnaround:zt-exec:${zeroturnaround.version}</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>io.grpc:io.grpc:${grpc.version}</id>
                                     <source>true</source>
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 aa58f2419..f863aa9db 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Oxygen" sequenceNumber="1536132640">
+<target name="Eclipse Oxygen" sequenceNumber="1536132641">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -355,6 +355,8 @@
       <unit id="org.slf4j.api.source" version="1.7.25.b001"/>
       <unit id="org.supercsv" version="2.4.0"/>
       <unit id="org.supercsv.source" version="2.4.0"/>
+      <unit id="org.zeroturnaround.zt-exec" version="1.10.0"/>
+      <unit id="org.zeroturnaround.zt-exec.source" version="1.10.0"/>
       <unit id="pgjdbc-ng" version="0.7.1"/>
       <unit id="pgjdbc-ng.source" version="0.7.1"/>
       <unit id="stax2-api" version="3.1.4"/>
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 2875cbbd2..b694d7cb5 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
@@ -354,6 +354,8 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	org.slf4j.api.source
 	org.supercsv
 	org.supercsv.source
+	org.zeroturnaround.zt-exec
+	org.zeroturnaround.zt-exec.source
 	pgjdbc-ng
 	pgjdbc-ng.source
 	stax2-api
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index cbce17232..3fae9e748 100644
--- 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"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Simantics 1.36.0" sequenceNumber="1540817207">
+<target name="Simantics 1.36.0" sequenceNumber="1540817208">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -355,6 +355,8 @@
       <unit id="org.slf4j.api.source" version="1.7.25.b001"/>
       <unit id="org.supercsv" version="2.4.0"/>
       <unit id="org.supercsv.source" version="2.4.0"/>
+      <unit id="org.zeroturnaround.zt-exec" version="1.10.0"/>
+      <unit id="org.zeroturnaround.zt-exec.source" version="1.10.0"/>
       <unit id="pgjdbc-ng" version="0.7.1"/>
       <unit id="pgjdbc-ng.source" version="0.7.1"/>
       <unit id="stax2-api" version="3.1.4"/>
-- 
2.47.1