Update to io.grcp 1.21.0 and protobuf 3.7.1

[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 5f40cf19edc972f41444804af0bb3d44134fd38a..11f07b95c7d83c8513e5b88636b8013d52fdb2a6 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -13,12 +13,17 @@
         <lucene.version>4.9.0</lucene.version>
         <lucene.version.actual>4.9.0.b0003</lucene.version.actual>
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
+        <jaxen.version>1.1.6</jaxen.version>
         <jdom.version>2.0.6</jdom.version>
         <jdom.version.actual>2.0.6.b0001</jdom.version.actual>
         <jackson.version>2.8.8</jackson.version>
         <javax.version>3.1.0</javax.version>
         <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.21.0</grpc.version>
+        <grpc.version.actual>1.21.0</grpc.version.actual>
+        <protobuf.version>3.7.1</protobuf.version>
     </properties>
 
 
@@ -155,6 +160,10 @@
                                         <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
+                                <artifact>
+                                    <id>jaxen:jaxen:${jaxen.version}</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>org.jdom:jdom2:${jdom.version}</id>
                                     <source>true</source>
@@ -395,6 +404,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Name>SLF4J API Module</Bundle-Name>
+                                        <Bundle-Version>${slf4j.version.actual}</Bundle-Version>
                                         <Bundle-SymbolicName>org.slf4j.api</Bundle-SymbolicName>
                                         <Export-Package>*;version=${slf4j.version}</Export-Package>
                                     </instructions>
@@ -417,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>
@@ -450,6 +461,94 @@
                                     <id>org.jsoup:jsoup:1.8.3</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
+                                    <source>true</source>
+                                </artifact>
+                                                               <!-- Since 1.21.0 grpc, a manually set up plugin is provided in third-party repository.
+                                                                    Note: grpc-core, grpc-context, and grpc-stub (maybe others as well) must be bundled into same plug-in, since they contain split packages.
+                                <artifact>
+                                    <id>io.grpc:grpc-core:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                                               <artifact>
+                                    <id>io.grpc:grpc-context:${grpc.version}</id>
+                                    <source>true</source>
+                                                                       <override>true</override>
+                                    <instructions>
+                                                                           <Fragment-Host>io.grpc.core</Fragment-Host> 
+                                                                       </instructions>
+                                </artifact>
+                                                               <artifact>
+                                    <id>io.grpc:grpc-protobuf:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                                               <artifact>
+                                    <id>io.grpc:grpc-stub:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>io.grpc:grpc-netty-shaded:${grpc.version}</id>
+                                    <source>true</source>
+                                                                       <override>true</override>
+                                    <instructions>
+                                                                           <Require-Bundle>
+                                                                                  io.grpc.core
+                                                                               </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>
+                                                               -->
+                                                               <!-- This was needed with old io.grpc / protobuf
+                                <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>
+                                                               -->
+                                                               <!-- grpc 1.21.0 dependencies -->
+                                                               <artifact>
+                                    <id>io.opencensus:opencensus-api:0.21.0</id>
+                                    <source>true</source>
+                                                               </artifact>
+                                                               <artifact>
+                                    <id>com.google.code.gson:gson:2.7</id>
+                                    <source>true</source>
+                                                               </artifact>
+                                                               <artifact>
+                                    <id>com.google.android:annotations:4.1.1.4</id>
+                                    <source>true</source>
+                                                               </artifact>
+                                                               <artifact>
+                                    <id>io.opencensus:opencensus-contrib-grpc-metrics:0.21.0</id>
+                                    <source>true</source>
+                                                               </artifact>
+                                                               <artifact>
+                                    <id>com.google.protobuf:protobuf-java:3.7.1</id>
+                                    <source>true</source>
+                                </artifact>
+                                                               <artifact>
+                                    <id>com.google.api.grpc:proto-google-common-protos:1.12.0</id>
+                                    <source>true</source>
+                                </artifact>
+                                                               <artifact>
+                                    <id>com.google.errorprone:error_prone_annotations:2.3.2</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>