Skip to content

Commit 97dd12b

Browse files
Use /pulsar/instances/deps/* instead of /pulsar/lib/* in classpath (#787)
* Use `/pulsar/instances/deps/*` instead of `/pulsar/lib/*` in classpath * Fix error * Fix error
1 parent df13250 commit 97dd12b

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

.ci/tests/integration/cases/java-download-function/manifests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ spec:
4949
java:
5050
jar: pulsar-functions-api-examples.jar
5151
jarLocation: function://public/default/test-java-function
52+
log:
53+
javaLog4JConfigFileType: "yaml"
5254
# to be delete & use admission hook
5355
clusterName: test
5456
autoAck: true

controllers/spec/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ func getProcessJavaRuntimeArgs(name, packageName, clusterName, logLevel, details
11881188
state *v1alpha1.Stateful,
11891189
tlsConfig TLSConfig, authConfig *v1alpha1.AuthConfig,
11901190
maxPendingAsyncRequests *int32, logConfigFileName string) []string {
1191-
classPath := "/pulsar/instances/java-instance.jar:/pulsar/lib/*"
1191+
classPath := "/pulsar/instances/java-instance.jar:/pulsar/instances/deps/*"
11921192
javaLogConfigPath := logConfigFileName
11931193
if javaLogConfigPath == "" {
11941194
javaLogConfigPath = DefaultJavaLogConfigPath

images/pulsar-functions-java-runner/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ FROM pulsar-functions-runner-base:latest
66
COPY --from=pulsar --chown=$UID:$GID /pulsar/instances/java-instance.jar /pulsar/instances/java-instance.jar
77
COPY --from=pulsar --chown=$UID:$GID /pulsar/instances/deps /pulsar/instances/deps
88

9+
RUN cp /pulsar/lib/com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-*.jar /pulsar/instances/deps/dataformat-jackson-dataformat-yaml.jar \
10+
&& cp /pulsar/lib/org.yaml-snakeyaml-*.jar /pulsar/instances/deps/org.yaml-snakeyaml.jar
11+
912
WORKDIR /pulsar
1013

1114
USER $USER

images/pulsar-functions-java-runner/pulsarctl.Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ RUN rm -rf /pulsar/lib/io.vertx-vertx-core-*.jar || true
4545
RUN rm -rf /pulsar/lib/presto || true
4646
RUN rm -rf /pulsar/conf/presto || true
4747

48+
RUN cp /pulsar/lib/com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-*.jar /pulsar/instances/deps/dataformat-jackson-dataformat-yaml.jar \
49+
&& cp /pulsar/lib/org.yaml-snakeyaml-*.jar /pulsar/instances/deps/org.yaml-snakeyaml.jar
50+
4851
ENV PULSAR_ROOT_LOGGER=INFO,CONSOLE
4952
ENV java.io.tmpdir=/pulsar/tmp/
5053

0 commit comments

Comments
 (0)