From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 6 Sep 2018 11:12:49 +0000 (+0300)
Subject: Add grpc to release/1.34.1 as well
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=e8369b764087830beb919280c5665c9bd25aed91;p=simantics%2Fplatform.git

Add grpc to release/1.34.1 as well

gitlab #98

Change-Id: Iac17f24b208919946e89804ca72c2cf4f4793041
---

diff --git a/releng/io.grpc/.classpath b/releng/io.grpc/.classpath
new file mode 100644
index 000000000..4ed627d28
--- /dev/null
+++ b/releng/io.grpc/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/releng/io.grpc/.gitignore b/releng/io.grpc/.gitignore
new file mode 100644
index 000000000..f0c3ef8ba
--- /dev/null
+++ b/releng/io.grpc/.gitignore
@@ -0,0 +1,4 @@
+.settings
+target
+/target/
+/.settings/
\ No newline at end of file
diff --git a/releng/io.grpc/.project b/releng/io.grpc/.project
new file mode 100644
index 000000000..a3f1cbe36
--- /dev/null
+++ b/releng/io.grpc/.project
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.grpc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/io.grpc/pom.xml b/releng/io.grpc/pom.xml
new file mode 100644
index 000000000..9dc3f9bdc
--- /dev/null
+++ b/releng/io.grpc/pom.xml
@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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>
+    <properties>
+        <grpc.version>1.14.0</grpc.version>
+        <grpc.version.actual>1.14.0.b007</grpc.version.actual>
+    </properties>
+
+    <groupId>io.grpc</groupId>
+    <artifactId>io.grpc</artifactId>
+    <version>1.14.0</version>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-core</artifactId>
+            <version>${grpc.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-context</artifactId>
+            <version>${grpc.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <version>${grpc.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+            <version>${grpc.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf-lite</artifactId>
+            <version>${grpc.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.1</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>io.grpc</Bundle-SymbolicName>
+                        <Bundle-Version>${grpc.version}</Bundle-Version>
+                        <Export-Package>*</Export-Package>
+                        <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+                        <Embed-Directory>target/dependency</Embed-Directory>
+                        <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>
+                        <Require-Bundle>
+                            com.google.guava,
+                            com.google.protobuf,
+                            com.google.api.grpc.proto-google-common-protos
+                        </Require-Bundle>
+                        <Import-Package>*;resolution:=optional</Import-Package>
+                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 5bb1c405a..82a5d94d5 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -21,6 +21,9 @@
         <jersey.version>2.25.1</jersey.version>
         <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.b007</grpc.version.actual>
+        <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
 
@@ -424,7 +427,8 @@
                                     <source>true</source>
                                 </artifact>
                                  <artifact>
-                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8</id>
+                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.14</id>
+                                     <source>true</source>
                                  </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
@@ -461,6 +465,50 @@
                                     <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>io.grpc:io.grpc:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>io.grpc:grpc-netty:${grpc.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Require-Bundle>
+                                             io.netty.buffer;bundle-version="4.1.27",
+                                             io.netty.codec;bundle-version="4.1.27",
+                                             io.netty.codec-http;bundle-version="4.1.27",
+                                             io.netty.codec-http2;bundle-version="4.1.27",
+                                             io.netty.codec-socks;bundle-version="4.1.27",
+                                             io.netty.common;bundle-version="4.1.27",
+                                             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.grpc
+                                        </Require-Bundle>
+                                        <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
+                                        <Require-Capability>
+                                            osgi.extender;
+                                                filter:="(osgi.extender=osgi.serviceloader.registrar)"
+                                        </Require-Capability>
+                                        <Provide-Capability>
+                                            osgi.serviceloader;
+                                                osgi.serviceloader=io.grpc.ServerProvider,
+                                            osgi.serviceloader;
+                                                osgi.serviceloader=io.grpc.ManagedChannelProvider
+                                        </Provide-Capability>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                                    </instructions>
+                                </artifact>
+                                <artifact>
+                                    <id>com.google.protobuf:protobuf-java:${protobuf.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Import-Package>!sun.misc.*,*;resolution:=optional</Import-Package>
+                                    </instructions>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>