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

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 1001743bea6053ea8d92b908d96a1ce132358ce4..5d63b4d00a175e495d641024e7ec56209e92a8be 100644 (file)
--- 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>
         <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>
     </properties>
 
     <repositories>


@@ -470,6 +471,10 @@
                                     <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
                                     <source>true</source>
                                 </artifact>
                                     <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>
                                 <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 aa58f2419da579a697bb5845ed5a6e642fcd2af5..f863aa9dbe039d845d051571e8486c4c6048ba84 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
 <?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"/>
   <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.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"/>
       <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 2875cbbd2780d0ebea6028e17ad2fc1b5585053c..b694d7cb5d1b40862ab5a28b4753b56827d00021 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
@@ -354,6 +354,8 @@ location "http://www.simantics.org/download/master/external-components/maven" {
        org.slf4j.api.source
        org.supercsv
        org.supercsv.source
        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
        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 cbce172327d603f58b6e733cbe4a3f89724e634b..3fae9e748d39205a118316fcc620feb93b057def 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"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
 <?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"/>
   <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.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"/>
       <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"/>