Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pulsar-functions dist package into pulsar binary distribution #1332

Merged
merged 24 commits into from
Mar 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
641df06
Move pulsar functions dependency version to root pom and remove dupli…
sijie Mar 4, 2018
ef65a9f
shade worker
sijie Mar 4, 2018
11e82f3
Merge remote-tracking branch 'apache/master' into address_function_co…
sijie Mar 4, 2018
7bc05f1
Fix broken master
sijie Mar 4, 2018
fc8d4c5
Upgrade the bookkeeper storage client dependency to the official book…
sijie Mar 4, 2018
07cb9d2
Merge branch 'upgrade_bk_dependencies' into shade_worker
sijie Mar 4, 2018
6b494c6
set `protobuf2.version` in pulsar-common
sijie Mar 4, 2018
0744dbc
Merge branch 'address_function_comments' into shade_worker
sijie Mar 4, 2018
59b10aa
provide a shaded worker
sijie Mar 4, 2018
0935c46
include worker dependency at broker
sijie Mar 4, 2018
579ba30
Merge remote-tracking branch 'apache/master' into shade_worker
sijie Mar 4, 2018
e7daf2d
Embeded function worker at broker
sijie Mar 5, 2018
f8bde86
Merge remote-tracking branch 'apache/master' into shade_worker
sijie Mar 5, 2018
f30a7c2
rename 'function worker' to 'functions worker'
sijie Mar 5, 2018
ce20823
add "--no-functions-worker" for pulsar-client-cpp tests
sijie Mar 5, 2018
c5a7779
Integrate function cli into pulsar-admin cli
sijie Mar 5, 2018
2648100
Merge pulsar-functions dist package into pulsar binary distribution
sijie Mar 5, 2018
277e113
Merge remote-tracking branch 'apache/master' into integrate_functions…
sijie Mar 5, 2018
ee06395
Fix license header issues
sijie Mar 5, 2018
0184b07
Merge branch 'integrate_functions_cli' into merge_dist
sijie Mar 5, 2018
aaca4f7
Fixed ZK cache test exectutor configuration.
merlimat Mar 6, 2018
c57e207
Merge remote-tracking branch 'merlimat/zk-cache-test' into integrate_…
sijie Mar 6, 2018
1fbb348
Merge branch 'integrate_functions_cli' into merge_dist
sijie Mar 6, 2018
5d39f18
Merge remote-tracking branch 'apache/master' into merge_dist
sijie Mar 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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