Add zeroturnaround to p2 site build's pom.xml

[simantics/platform.git] / releng / org.simantics.sdk.build.p2.site / pom.xml

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index cea0614ada9473204b859e62106ff5da46c7b6e0..5d63b4d00a175e495d641024e7ec56209e92a8be 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -23,8 +23,9 @@
         <slf4j.version>1.7.25</slf4j.version>
         <slf4j.version.actual>1.7.25.b001</slf4j.version.actual>
         <grpc.version>1.14.0</grpc.version>
-        <grpc.version.actual>1.14.0.b004</grpc.version.actual>
+        <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>
@@ -33,7 +34,7 @@
             <id>project-specific-deps</id>
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
-        </repository>
+        </repository>c.version.actual
         --> 
     </repositories>
 
@@ -471,49 +472,11 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>io.grpc:io.grpc:${grpc.version}</id>
-                                    <source>true</source>
-                                </artifact>
-                                <!-- <artifact>
-                                    <id>io.grpc:grpc-core:${grpc.version}</id>
+                                    <id>org.zeroturnaround:zt-exec:${zeroturnaround.version}</id>
                                     <source>true</source>
-                                    <override></override>
-                                    <instructions>
-                                        <Export-Package>
-                                            io.grpc;version="${grpc.version}",
-                                            io.grpc.inprocess;version="${grpc.version}",
-                                            io.grpc.internal;version="${grpc.version}",
-                                            io.grpc.util;version="${grpc.version}"
-                                        </Export-Package>
-                                        <Import-Package>!com.google.errorprone.annotations,*</Import-Package>
-                                        <Require-Capability>
-                                            osgi.extender;
-                                                filter:="(osgi.extender=osgi.serviceloader.processor)",
-                                            osgi.serviceloader;
-                                                filter:="(osgi.serviceloader=io.grpc.ServerProvider)";
-                                                cardinality:=multiple,
-                                            osgi.serviceloader;
-                                                filter:="(osgi.serviceloader=io.grpc.ManagedChannelProvider)";
-                                                cardinality:=multiple
-                                        </Require-Capability>
-                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>io.grpc:grpc-context:${grpc.version}</id>
-                                    <source>true</source>
-                                    <override></override>
-                                    <instructions>
-                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
-                                        <Fragment-Host>io.grpc.core</Fragment-Host>
-                                    </instructions>
-                                </artifact>-->
-                                <artifact>
-                                    <id>io.grpc:grpc-stub:${grpc.version}</id>
-                                    <source>true</source>
-                                </artifact>
-                                <artifact>
-                                    <id>io.grpc:grpc-protobuf:${grpc.version}</id>
+                                    <id>io.grpc:io.grpc:${grpc.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
@@ -531,7 +494,8 @@
                                              io.netty.handler;bundle-version="4.1.27",
                                              io.netty.handler-proxy;bundle-version="4.1.27",
                                              io.netty.resolver;bundle-version="4.1.27",
-                                             io.netty.transport;bundle-version="4.1.27"
+                                             io.netty.transport;bundle-version="4.1.27",
+                                             io.grpc
                                         </Require-Bundle>
                                         <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
                                         <Require-Capability>
@@ -555,6 +519,11 @@
                                         <Import-Package>!sun.misc.*,*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
+                                <artifact>
+                                    <id>com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1</id>
+                                    <source>true</source>
+                                    <transitive>false</transitive>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>