홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Gerrit Code Review
88353862 1 parent f4fd2a2e

Consolidate gRPC OSGi bundle handling 

Change-Id: I01e5058e08372b142058769db081b8de154e1c9b
Inline Side-by-side
Showing 4 changed files with 11 additions and 40 deletions
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
19 description="${project.description}"> 19 description="${project.description}">
20 <feature>onos-api</feature> 20 <feature>onos-api</feature>
21 - <bundle>mvn:com.google.protobuf/protobuf-java/3.0.0</bundle> 21 + <bundle>mvn:com.google.protobuf/protobuf-java/${protobuf.version}</bundle>
22 <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle> 22 <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
23 </feature> 23 </feature>
24 </features> 24 </features>
......
...@@ -125,9 +125,6 @@ ...@@ -125,9 +125,6 @@
125 <artifactId>protobuf-maven-plugin</artifactId> 125 <artifactId>protobuf-maven-plugin</artifactId>
126 <version>0.5.0</version> 126 <version>0.5.0</version>
127 <configuration> 127 <configuration>
128 - <!-- The version of protoc must match protobuf-java. If you don't
129 - depend on protobuf-java directly, you will be transitively depending on the
130 - protobuf-java version that grpc depends on. -->
131 <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact> 128 <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
132 </configuration> 129 </configuration>
133 <executions> 130 <executions>
......
...@@ -17,26 +17,8 @@ ...@@ -17,26 +17,8 @@
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="${project.artifactId}-${project.version}">
18 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
19 description="${project.description}"> 19 description="${project.description}">
20 - <feature>onos-api</feature> 20 + <feature version="${project.version}">onos-api</feature>
21 - <bundle>mvn:com.google.protobuf/protobuf-java/3.0.0</bundle> 21 +
22 - <bundle>mvn:io.netty/netty-common/4.1.3.Final</bundle>
23 - <bundle>mvn:io.netty/netty-buffer/4.1.3.Final</bundle>
24 - <bundle>mvn:io.netty/netty-transport/4.1.3.Final</bundle>
25 - <bundle>mvn:io.netty/netty-handler/4.1.3.Final</bundle>
26 - <bundle>mvn:io.netty/netty-codec/4.1.3.Final</bundle>
27 - <bundle>mvn:io.netty/netty-codec-http/4.1.3.Final</bundle>
28 - <bundle>mvn:io.netty/netty-codec-http2/4.1.3.Final</bundle>
29 - <bundle>mvn:io.netty/netty-resolver/4.1.3.Final</bundle>
30 - <!-- TODO: Create shaded jar for these. -->
31 - <bundle>wrap:mvn:com.google.auth/google-auth-library-credentials/0.4.0$Bundle-SymbolicName=com.google.auth.google-auth-library-credentials&amp;Bundle-Version=0.4.0</bundle>
32 - <bundle>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/0.4.0$Bundle-SymbolicName=com.google.auth.google-auth-library-oauth2-http&amp;Bundle-Version=0.4.0</bundle>
33 - <!-- io.grpc.internal required for DnsNameResolverProvider -->
34 - <bundle>wrap:mvn:io.grpc/grpc-core/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-core&amp;Bundle-Version=1.0.0&amp;Export-Package=*;version=1.0.0,io.grpc.internal;version=1.0.0&amp;</bundle>
35 - <bundle>wrap:mvn:io.grpc/grpc-protobuf-lite/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-protobuf-lite&amp;Bundle-Version=1.0.0&amp;</bundle>
36 - <bundle>wrap:mvn:io.grpc/grpc-protobuf/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-protobuf&amp;Bundle-Version=1.0.0&amp;</bundle>
37 - <bundle>wrap:mvn:io.grpc/grpc-stub/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-stub&amp;Bundle-Version=1.0.0&amp;</bundle>
38 - <bundle>wrap:mvn:io.grpc/grpc-netty/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-netty&amp;Bundle-Version=1.0.0&amp;Import-Package=io.netty.*;version=4.1.3,*</bundle>
39 - <bundle>wrap:mvn:io.grpc/grpc-auth/1.0.0-pre2$Bundle-SymbolicName=io.grpc.grpc-auth&amp;Bundle-Version=1.0.0&amp;Import-Package=javax.net.ssl,*</bundle>
40 <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle> 22 <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
41 </feature> 23 </feature>
42 </features> 24 </features>
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
33 <onos.app.title>ONOS gRPC API</onos.app.title> 33 <onos.app.title>ONOS gRPC API</onos.app.title>
34 <onos.app.requires> 34 <onos.app.requires>
35 org.onosproject.incubator.rpc, 35 org.onosproject.incubator.rpc,
36 - org.onosproject.incubator.protobuf 36 + org.onosproject.incubator.protobuf,
37 + org.onosproject.incubator.grpc
37 </onos.app.requires> 38 </onos.app.requires>
38 <protobuf.version>3.0.0</protobuf.version> 39 <protobuf.version>3.0.0</protobuf.version>
39 - <!-- Note: update feature.xml when updating -->
40 <grpc.version>1.0.0-pre2</grpc.version> 40 <grpc.version>1.0.0-pre2</grpc.version>
41 <grpc.netty.version>4.1.3.Final</grpc.netty.version> 41 <grpc.netty.version>4.1.3.Final</grpc.netty.version>
42 </properties> 42 </properties>
...@@ -72,16 +72,6 @@ ...@@ -72,16 +72,6 @@
72 <artifactId>grpc-stub</artifactId> 72 <artifactId>grpc-stub</artifactId>
73 <version>${grpc.version}</version> 73 <version>${grpc.version}</version>
74 </dependency> 74 </dependency>
75 - <dependency>
76 - <groupId>io.grpc</groupId>
77 - <artifactId>grpc-netty</artifactId>
78 - <version>${grpc.version}</version>
79 - </dependency>
80 - <dependency>
81 - <groupId>io.grpc</groupId>
82 - <artifactId>grpc-auth</artifactId>
83 - <version>${grpc.version}</version>
84 - </dependency>
85 75
86 <dependency> 76 <dependency>
87 <groupId>junit</groupId> 77 <groupId>junit</groupId>
...@@ -103,6 +93,12 @@ ...@@ -103,6 +93,12 @@
103 </dependency> 93 </dependency>
104 94
105 <dependency> 95 <dependency>
96 + <groupId>org.onosproject</groupId>
97 + <artifactId>onos-incubator-grpc</artifactId>
98 + <version>${project.version}</version>
99 + </dependency>
100 +
101 + <dependency>
106 <groupId>org.apache.felix</groupId> 102 <groupId>org.apache.felix</groupId>
107 <artifactId>org.apache.felix.scr.annotations</artifactId> 103 <artifactId>org.apache.felix.scr.annotations</artifactId>
108 <scope>provided</scope> 104 <scope>provided</scope>
...@@ -151,10 +147,6 @@ ...@@ -151,10 +147,6 @@
151 <plugin> 147 <plugin>
152 <groupId>org.apache.maven.plugins</groupId> 148 <groupId>org.apache.maven.plugins</groupId>
153 <artifactId>maven-compiler-plugin</artifactId> 149 <artifactId>maven-compiler-plugin</artifactId>
154 - <configuration>
155 - <source>1.8</source>
156 - <target>1.8</target>
157 - </configuration>
158 </plugin> 150 </plugin>
159 <plugin> 151 <plugin>
160 <groupId>org.apache.felix</groupId> 152 <groupId>org.apache.felix</groupId>
......