Skip to content

Commit

Permalink
Merge pulsar-functions dist package into pulsar binary distribution (#…
Browse files Browse the repository at this point in the history
…1332)

* Move pulsar functions dependency version to root pom and remove duplicated license headers

This addresses some comments in pulsar functions PR #1314

* shade worker

* Fix broken master

* Upgrade the bookkeeper storage client dependency to the official bookkeeper version

This removes the temp dependency in `pulsar-functions-instance`

* set `protobuf2.version` in pulsar-common

* provide a shaded worker

* include worker dependency at broker

* Embeded function worker at broker

* rename 'function worker' to 'functions worker'

* add "--no-functions-worker" for pulsar-client-cpp tests

* Integrate function cli into pulsar-admin cli

- rename `pulsar-client-tools-shaded` to `pulsar-client-admin-shaded-for-functions`, because this module is used by functions only to avoid protobuf conflicts
- move protobuf3 references to Utils, so it won't be referenced out side of pulsar-functions
- integrate function cli into pulsar-admin cli

* Merge pulsar-functions dist package into pulsar binary distribution

* Fix license header issues

* Fixed ZK cache test exectutor configuration.

Fixes #1338
  • Loading branch information
sijie authored and merlimat committed Mar 6, 2018
1 parent 9503274 commit e9e31c7
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 1,091 deletions.
9 changes: 9 additions & 0 deletions all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,15 @@
<artifactId>pulsar-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>

<!-- function examples -->
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-functions-api-examples</artifactId>
<version>${project.version}</version>
<!-- make sure the api examples are compiled before assembly -->
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
14 changes: 14 additions & 0 deletions all/src/assemble/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
<fileSet>
<directory>${basedir}/licenses</directory>
</fileSet>
<fileSet>
<directory>${basedir}/../pulsar-functions/runtime/target/python-instance</directory>
<outputDirectory>instances/python-instance</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
Expand All @@ -68,6 +72,16 @@
<outputDirectory>.</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>${basedir}/../pulsar-functions/runtime/target/java-instance.jar</source>
<destName>java-instance.jar</destName>
<outputDirectory>instances</outputDirectory>
</file>
<file>
<source>${basedir}/../pulsar-functions/java-examples/target/pulsar-functions-api-examples.jar</source>
<destName>api-examples.jar</destName>
<outputDirectory>examples</outputDirectory>
</file>
</files>
<dependencySets>
<dependencySet>
Expand Down
192 changes: 0 additions & 192 deletions pulsar-functions/bin/pulsar

This file was deleted.

148 changes: 0 additions & 148 deletions pulsar-functions/bin/pulsar-functions

This file was deleted.

Loading

0 comments on commit e9e31c7

Please sign in to comment.