Starting to run out of options with this one...

gitlab #98

Change-Id: I4815b0fee534baa14feb46c67f8332eaac53ebf8

diff --git a/releng/io.grpc/.classpath b/releng/io.grpc/.classpath
new file mode 100644 (file)
index 0000000..4ed627d
--- /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 (file)
index 0000000..f0c3ef8
--- /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 (file)
index 0000000..a3f1cbe
--- /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 (file)
index 0000000..57f6d03
--- /dev/null
+++ b/releng/io.grpc/pom.xml
@@ -0,0 +1,65 @@
+<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>
+    <parent>
+        <groupId>org.simantics</groupId>
+        <artifactId>org.simantics.sdk.build</artifactId>
+        <version>1.30.0</version>
+        <relativePath>../org.simantics.sdk.build/</relativePath>
+    </parent>
+
+    <groupId>io.grpc</groupId>
+    <artifactId>io.grpc</artifactId>
+    <version>${grpc.version}</version>
+    <packaging>bundle</packaging>
+    
+    <properties>
+        <grpc.version>1.14.0</grpc.version>
+    </properties>
+
+    <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>
+    </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>
+                    </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 713b699f908a3e0324e39047db2f18314434d076..c7a210ecb7ae2eade95f6e46eeef5497f7321a41 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -27,7 +27,6 @@
         <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
-
     <repositories>
         <!--
         <repository>
@@ -471,7 +470,7 @@
                                     <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
                                     <source>true</source>
                                 </artifact>
-                                <artifact>
+                                <!-- <artifact>
                                     <id>io.grpc:grpc-core:${grpc.version}</id>
                                     <source>true</source>
                                     <override></override>
@@ -504,7 +503,7 @@
                                         <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                                         <Fragment-Host>io.grpc.core</Fragment-Host>
                                     </instructions>
-                                </artifact>
+                                </artifact>-->
                                 <artifact>
                                     <id>io.grpc:grpc-stub:${grpc.version}</id>
                                     <source>true</source>