Skip to content

Commit

Permalink
Merge pull request #396 from mohanvive/master
Browse files Browse the repository at this point in the history 
Add io-grpc & map-protobuf extensions to distribution & License file updates
  • Loading branch information
@mohanvive
mohanvive authored Sep 12, 2019
2 parents af1ffb0 + fd808dd commit 84d81d4
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 19 deletions.
2 changes: 2 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1215,6 +1215,7 @@
<siddhi.io.cdc.version>2.0.3</siddhi.io.cdc.version>
<siddhi.io.prometheus.version>2.0.1</siddhi.io.prometheus.version>
<siddhi.io.nats.version>2.0.4</siddhi.io.nats.version>
<siddhi.io.grpc.version>1.0.0-beta</siddhi.io.grpc.version>

<siddhi.map.json.version>5.0.4</siddhi.map.json.version>
<siddhi.map.avro.version>2.0.2</siddhi.map.avro.version>
Expand All @@ -1223,6 +1224,7 @@
<siddhi.map.xml.version>5.0.3</siddhi.map.xml.version>
<siddhi.map.keyvalue.version>2.0.3</siddhi.map.keyvalue.version>
<siddhi.map.csv.version>2.0.2</siddhi.map.csv.version>
<siddhi.map.protobuf.version>1.0.0-beta</siddhi.map.protobuf.version>

<siddhi.store.rdbms.version>6.0.3</siddhi.store.rdbms.version>
<siddhi.store.mongodb.version>2.0.1</siddhi.store.mongodb.version>
Expand Down
22 changes: 12 additions & 10 deletions runner/LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ javax.validation.api_1.1.0.Final.jar
javax.websocket-api_1.1.0.jar bundle cddl+gpl 2368
javax.ws.rs-api_2.0.0.jar bundle cddl+gpl 1538
jaxen_1.2.0.jar bundle bsd2 4391
jaxrs-delegates_2.8.0.jar bundle apache2 4395
jaxrs-delegates_2.8.1.jar bundle apache2 4395
json_3.0.0.wso2v1.jar bundle apache2 6503
libthrift_0.9.2.wso2v1.jar bundle apache2 5912
msf4j-analytics_2.8.0.jar bundle apache2 4399
msf4j-core_2.8.0.jar bundle apache2 4405
msf4j-swagger_2.8.0.jar bundle apache2 4409
msf4j-analytics_2.8.1.jar bundle apache2 4399
msf4j-core_2.8.1.jar bundle apache2 4405
msf4j-swagger_2.8.1.jar bundle apache2 4409
org.antlr.antlr4-runtime_4.7.2.jar bundle apache2 3662
org.apache.commons.commons-csv_1.7.0.jar bundle apache2 4404
org.apache.commons.fileupload_1.3.3.jar bundle apache2 4397
Expand Down Expand Up @@ -108,7 +108,7 @@ org.wso2.carbon.analytics.idp.client_6.1.31.jar
org.wso2.carbon.analytics.permissions_6.1.31.jar bundle apache2 21907
org.wso2.carbon.caching_1.1.3.jar bundle apache2 14020
org.wso2.carbon.config_2.1.14.jar bundle apache2 21895
org.wso2.carbon.core_5.2.10.jar bundle apache2 21899
org.wso2.carbon.core_5.2.11.jar bundle apache2 21899
org.wso2.carbon.database.query.manager_6.1.31.jar bundle apache2 21904
org.wso2.carbon.databridge.agent_6.1.31.jar bundle apache2 21906
org.wso2.carbon.databridge.commons.thrift_6.1.31.jar bundle apache2 21905
Expand All @@ -117,7 +117,7 @@ org.wso2.carbon.datasource.core_1.1.8.jar
org.wso2.carbon.deployment.engine_5.2.2.jar bundle apache2 21902
org.wso2.carbon.extensions.touchpoint_1.1.1.jar bundle apache2 14616
org.wso2.carbon.jndi_1.0.6.jar bundle apache2 21894
org.wso2.carbon.launcher-5.2.10.jar bundle apache2 21911
org.wso2.carbon.launcher-5.2.11.jar bundle apache2 21911
org.wso2.carbon.messaging_3.0.2.jar bundle apache2 14011
org.wso2.carbon.metrics.core_2.3.11.jar bundle apache2 21898
org.wso2.carbon.metrics.das.core_2.3.11.jar bundle apache2 21908
Expand All @@ -126,7 +126,7 @@ org.wso2.carbon.metrics.jdbc.core_2.3.11.jar
org.wso2.carbon.metrics.jdbc.reporter_2.3.11.jar bundle apache2 21892
org.wso2.carbon.secvault.ciphertool.5.0.15.jar bundle apache2 21913
org.wso2.carbon.secvault_5.0.15.jar bundle apache2 21896
org.wso2.carbon.tools.core-5.2.10.jar bundle apache2 21912
org.wso2.carbon.tools.core-5.2.11.jar bundle apache2 21912
org.wso2.carbon.utils_2.0.10.jar bundle apache2 21909
org.wso2.transport.http.netty_6.1.9.jar bundle apache2 21900
org.yaml.snakeyaml_1.23.0.jar bundle apache2 3590
Expand All @@ -147,7 +147,8 @@ siddhi-execution-unique-5.0.3.jar
siddhi-execution-unitconversion-2.0.2.jar bundle apache2 4422
siddhi-io-cdc-2.0.3.jar bundle apache2 4429
siddhi-io-email-2.0.3.jar bundle apache2 4426
siddhi-io-file-2.0.1.jar bundle apache2 4416
siddhi-io-file-2.0.1.jar bundle apache2 4416
siddhi-io-grpc-1.0.0-beta.jar bundle apache2 4468
siddhi-io-http-2.1.1.jar bundle apache2 4435
siddhi-io-jms-2.0.2.jar bundle apache2 4437
siddhi-io-kafka-5.0.3.jar bundle apache2 4428
Expand All @@ -159,8 +160,9 @@ siddhi-map-binary-2.0.2.jar
siddhi-map-csv-2.0.2.jar bundle apache2 4413
siddhi-map-json-5.0.4.jar bundle apache2 4427
siddhi-map-keyvalue-2.0.3.jar bundle apache2 4421
siddhi-map-text-2.0.4.jar bundle apache2 4419
siddhi-map-xml-5.0.3.jar bundle apache2 4425
siddhi-map-protobuf-1.0.0-beta.jar bundle apache2 4469
siddhi-map-text-2.0.4.jar bundle apache2 4419
siddhi-map-xml-5.0.3.jar bundle apache2 4425
siddhi-query-api_5.1.4.jar bundle apache2 4411
siddhi-query-compiler_5.1.4.jar bundle apache2 4400
siddhi-script-js-5.0.2.jar bundle apache2 4420
Expand Down
12 changes: 12 additions & 0 deletions runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,12 @@
<version>${siddhi.io.nats.version}</version>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>io.siddhi.extension.io.grpc</groupId>
<artifactId>siddhi-io-grpc</artifactId>
<version>${siddhi.io.grpc.version}</version>
<type>jar</type>
</artifactItem>
<!--<artifactItem>-->
<!--<groupId>io.siddhi.extension.io.googlepubsub</groupId>-->
<!--<artifactId>siddhi-io-googlepubsub</artifactId>-->
Expand Down Expand Up @@ -438,6 +444,12 @@
<version>${siddhi.map.avro.version}</version>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>io.siddhi.extension.map.protobuf</groupId>
<artifactId>siddhi-map-protobuf</artifactId>
<version>${siddhi.map.protobuf.version}</version>
<type>jar</type>
</artifactItem>

<!-- Store Extensions -->
<artifactItem>
Expand Down
20 changes: 11 additions & 9 deletions tooling/LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ javax.servlet-api_3.1.0.jar cddl+gpl
javax.websocket-api_1.1.0.jar bundle cddl+gpl 2368
javax.ws.rs-api_2.0.0.jar bundle cddl+gpl 1538
jaxen_1.2.0.jar bundle bsd2 4391
jaxrs-delegates_2.8.0.jar bundle apache2 4395
jaxrs-delegates_2.8.1.jar bundle apache2 4395
json_3.0.0.wso2v1.jar bundle apache2 6503
libthrift_0.9.2.wso2v1.jar bundle apache2 5912
msf4j-analytics_2.8.0.jar bundle apache2 4399
msf4j-core_2.8.0.jar bundle apache2 4405
msf4j-swagger_2.8.0.jar bundle apache2 4409
msf4j-analytics_2.8.1.jar bundle apache2 4399
msf4j-core_2.8.1.jar bundle apache2 4405
msf4j-swagger_2.8.1.jar bundle apache2 4409
org.antlr.antlr4-runtime_4.7.2.jar bundle apache2 3662
org.apache.commons.commons-csv_1.7.0.jar bundle apache2 4404
org.apache.commons.fileupload_1.3.3.jar bundle apache2 4397
Expand Down Expand Up @@ -105,7 +105,7 @@ org.wso2.carbon.analytics.idp.client_6.1.31.jar
org.wso2.carbon.analytics.permissions_6.1.31.jar bundle apache2 21907
org.wso2.carbon.caching_1.1.3.jar bundle apache2 14020
org.wso2.carbon.config_2.1.14.jar bundle apache2 21895
org.wso2.carbon.core_5.2.10.jar bundle apache2 21899
org.wso2.carbon.core_5.2.11.jar bundle apache2 21899
org.wso2.carbon.database.query.manager_6.1.31.jar bundle apache2 21904
org.wso2.carbon.databridge.agent_6.1.31.jar bundle apache2 21906
org.wso2.carbon.databridge.commons.thrift_6.1.31.jar bundle apache2 21905
Expand All @@ -114,7 +114,7 @@ org.wso2.carbon.datasource.core_1.1.8.jar
org.wso2.carbon.deployment.engine_5.2.2.jar bundle apache2 21902
org.wso2.carbon.extensions.touchpoint_1.1.1.jar bundle apache2 14616
org.wso2.carbon.jndi_1.0.6.jar bundle apache2 21894
org.wso2.carbon.launcher-5.2.10.jar bundle apache2 21911
org.wso2.carbon.launcher-5.2.11.jar bundle apache2 21911
org.wso2.carbon.messaging_3.0.2.jar bundle apache2 14011
org.wso2.carbon.metrics.core_2.3.11.jar bundle apache2 21898
org.wso2.carbon.metrics.das.core_2.3.11.jar bundle apache2 21908
Expand All @@ -123,7 +123,7 @@ org.wso2.carbon.metrics.jdbc.core_2.3.11.jar
org.wso2.carbon.metrics.jdbc.reporter_2.3.11.jar bundle apache2 21892
org.wso2.carbon.secvault.ciphertool.5.0.15.jar bundle apache2 21913
org.wso2.carbon.secvault_5.0.15.jar bundle apache2 21896
org.wso2.carbon.tools.core-5.2.10.jar bundle apache2 21912
org.wso2.carbon.tools.core-5.2.11.jar bundle apache2 21912
org.wso2.carbon.utils_2.0.10.jar bundle apache2 21909
org.wso2.transport.http.netty_6.1.9.jar bundle apache2 21900
org.yaml.snakeyaml_1.23.0.jar bundle apache2 3590
Expand All @@ -144,7 +144,8 @@ siddhi-execution-unitconversion-2.0.2.jar
siddhi-io-cdc-2.0.3.jar bundle apache2 4429
siddhi-io-email-2.0.3.jar bundle apache2 4426
siddhi-io-file-2.0.1.jar bundle apache2 4416
siddhi-io-http-2.1.1.jar bundle apache2 4435
siddhi-io-grpc-1.0.0-beta.jar bundle apache2 4468
siddhi-io-http-2.1.1.jar bundle apache2 4435
siddhi-io-jms-2.0.2.jar bundle apache2 4437
siddhi-io-kafka-5.0.3.jar bundle apache2 4428
siddhi-io-nats-2.0.4.jar bundle apache2 4414
Expand All @@ -155,7 +156,8 @@ siddhi-map-binary-2.0.2.jar
siddhi-map-csv-2.0.2.jar bundle apache2 4413
siddhi-map-json-5.0.4.jar bundle apache2 4427
siddhi-map-keyvalue-2.0.3.jar bundle apache2 4421
siddhi-map-text-2.0.4.jar bundle apache2 4419
siddhi-map-protobuf-1.0.0-beta.jar bundle apache2 4469
siddhi-map-text-2.0.4.jar bundle apache2 4419
siddhi-map-xml-5.0.3.jar bundle apache2 4425
siddhi-query-api_5.1.4.jar bundle apache2 4411
siddhi-query-compiler_5.1.4.jar bundle apache2 4400
Expand Down
12 changes: 12 additions & 0 deletions tooling/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,12 @@
<version>${siddhi.io.nats.version}</version>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>io.siddhi.extension.io.grpc</groupId>
<artifactId>siddhi-io-grpc</artifactId>
<version>${siddhi.io.grpc.version}</version>
<type>jar</type>
</artifactItem>
<!--<artifactItem>-->
<!--<groupId>io.siddhi.extension.io.googlepubsub</groupId>-->
<!--<artifactId>siddhi-io-googlepubsub</artifactId>-->
Expand Down Expand Up @@ -415,6 +421,12 @@
<version>${siddhi.map.avro.version}</version>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>io.siddhi.extension.map.protobuf</groupId>
<artifactId>siddhi-map-protobuf</artifactId>
<version>${siddhi.map.protobuf.version}</version>
<type>jar</type>
</artifactItem>

<!-- Store Extensions -->
<artifactItem>
Expand Down

0 comments on commit 84d81d4

Please sign in to comment.