diff --git a/pom.xml b/pom.xml index c2c10d1d51ad7..e44b2b530e964 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,12 @@ flexible messaging model and an intuitive client API. 2.8.4 6.19 1.3.7 + 0.5.0 + 3.5.1 + 1.5.0 + 1.0.0 + 2.8.2 + 0.6.0 3.4.0 @@ -619,6 +625,37 @@ flexible messaging model and an intuitive client API. ${bouncycastle.version} + + net.jodah + typetools + ${typetools.version} + + + + io.grpc + grpc-all + ${grpc.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + com.yahoo.datasketches + sketches-core + ${sketches.version} + + + + + org.apache.distributedlog + distributedlog-core-shaded + ${bookkeeper.version} + + com.lmax diff --git a/pulsar-functions/api-java/pom.xml b/pulsar-functions/api-java/pom.xml index 9d47ee3c9d04c..480d19a9f463a 100644 --- a/pulsar-functions/api-java/pom.xml +++ b/pulsar-functions/api-java/pom.xml @@ -40,7 +40,6 @@ net.jodah typetools - 0.5.0 test diff --git a/pulsar-functions/cli/pom.xml b/pulsar-functions/cli/pom.xml index 5e8f76b6b7c26..b22a5022de259 100644 --- a/pulsar-functions/cli/pom.xml +++ b/pulsar-functions/cli/pom.xml @@ -53,12 +53,6 @@ ${project.version} - - ${project.groupId} - pulsar-client-tools-shaded - ${project.version} - - org.glassfish.jersey.media jersey-media-json-jackson diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml index e0bcb53855d04..fb45cdfdf3d87 100644 --- a/pulsar-functions/instance/pom.xml +++ b/pulsar-functions/instance/pom.xml @@ -51,154 +51,22 @@ log4j-core - - ${project.groupId} - pulsar-client-tools-shaded - ${project.version} - - - - org.apache.commons - commons-lang3 - - - commons-codec - commons-codec - - - commons-collections - commons-collections - - - org.asynchttpclient - async-http-client - - - io.netty - netty - - - io.netty - netty-all - - - io.netty - netty-codec-http - - - io.netty - netty-tcnative-boringssl-static - - - io.netty - netty-transport-native-epoll - - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - - - com.google.code.gson - gson - - - net.jpountz.lz4 - lz4 - - - org.apache.httpcomponents - httpcomponents-core - - - org.apache.httpcomponents - httpcomponents-client - - - commons-logging - commons-logging - - - com.yahoo.datasketches - sketches-core - - - - - - org.apache.pulsar - pulsar-functions-proto - ${project.version} - - - - ${project.groupId} - pulsar-functions-api - ${project.version} - - ${project.groupId} pulsar-functions-utils ${project.version} - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - com.google.code.gson - gson - ${gson.version} - - - - - com.google.protobuf - protobuf-java - 3.5.1 - - - - io.grpc - grpc-all - 1.5.0 - - + org.apache.bookkeeper stream-storage-java-client 0.6.0 - - net.jodah - typetools - 0.5.0 - - com.yahoo.datasketches sketches-core - 0.6.0 @@ -211,6 +79,11 @@ jcommander + + net.jodah + typetools + + diff --git a/pulsar-functions/instance/src/main/python/contextimpl.py b/pulsar-functions/instance/src/main/python/contextimpl.py index 9218407b96c46..b021421505444 100644 --- a/pulsar-functions/instance/src/main/python/contextimpl.py +++ b/pulsar-functions/instance/src/main/python/contextimpl.py @@ -20,23 +20,6 @@ # -*- encoding: utf-8 -*- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# """contextimpl.py: ContextImpl class that implements the Context interface """ diff --git a/pulsar-functions/instance/src/main/python/log.py b/pulsar-functions/instance/src/main/python/log.py index 3838b60e05e97..f36e684f23efd 100644 --- a/pulsar-functions/instance/src/main/python/log.py +++ b/pulsar-functions/instance/src/main/python/log.py @@ -20,23 +20,6 @@ # -*- encoding: utf-8 -*- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ''' log.py ''' import logging from logging.handlers import RotatingFileHandler diff --git a/pulsar-functions/instance/src/main/python/python_instance.py b/pulsar-functions/instance/src/main/python/python_instance.py index ed5f57342abf0..08fcef5272869 100644 --- a/pulsar-functions/instance/src/main/python/python_instance.py +++ b/pulsar-functions/instance/src/main/python/python_instance.py @@ -20,23 +20,6 @@ # -*- encoding: utf-8 -*- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# """python_instance.py: Python Instance for running python functions """ import os diff --git a/pulsar-functions/instance/src/main/python/python_instance_main.py b/pulsar-functions/instance/src/main/python/python_instance_main.py index 9d4159d8dc81f..3fd43580ae18c 100644 --- a/pulsar-functions/instance/src/main/python/python_instance_main.py +++ b/pulsar-functions/instance/src/main/python/python_instance_main.py @@ -20,23 +20,6 @@ # -*- encoding: utf-8 -*- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# """python_instance_main.py: The main for the Python Instance """ import argparse diff --git a/pulsar-functions/instance/src/main/python/server.py b/pulsar-functions/instance/src/main/python/server.py index 816d5b732f91a..3fe7bd44ac4ed 100644 --- a/pulsar-functions/instance/src/main/python/server.py +++ b/pulsar-functions/instance/src/main/python/server.py @@ -20,23 +20,6 @@ # -*- encoding: utf-8 -*- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# """python_instance.py: Python Instance for running python functions """ from concurrent import futures diff --git a/pulsar-functions/instance/src/main/python/util.py b/pulsar-functions/instance/src/main/python/util.py index 439f648e4da38..efa238dee4762 100644 --- a/pulsar-functions/instance/src/main/python/util.py +++ b/pulsar-functions/instance/src/main/python/util.py @@ -20,23 +20,6 @@ # -*- encoding: utf-8 -*- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# """util.py: Some misc utility functions """ import os diff --git a/pulsar-functions/metrics/pom.xml b/pulsar-functions/metrics/pom.xml index 6c890a3e145c2..421b4ecdc2f97 100644 --- a/pulsar-functions/metrics/pom.xml +++ b/pulsar-functions/metrics/pom.xml @@ -22,10 +22,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - 2.8.2 - - org.apache.pulsar pulsar-functions @@ -37,20 +33,6 @@ - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - org.apache.pulsar pulsar-functions-proto @@ -63,44 +45,6 @@ ${project.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - com.google.code.gson - gson - ${gson.version} - - - - - com.google.protobuf - protobuf-java - 3.5.1 - - - - net.jodah - typetools - 0.5.0 - - diff --git a/pulsar-functions/proto/pom.xml b/pulsar-functions/proto/pom.xml index 03b19022bbd5d..9bae8b52ba0e8 100644 --- a/pulsar-functions/proto/pom.xml +++ b/pulsar-functions/proto/pom.xml @@ -38,13 +38,12 @@ com.google.protobuf protobuf-java - 3.5.1 + ${protobuf3.version} io.grpc grpc-all - 1.5.0 @@ -62,10 +61,10 @@ protobuf-maven-plugin 0.5.0 - com.google.protobuf:protoc:3.5.1:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf3.version}:exe:${os.detected.classifier} true grpc-java - io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.version}:exe:${os.detected.classifier} diff --git a/pulsar-functions/runtime/pom.xml b/pulsar-functions/runtime/pom.xml index 4a491621bf61e..dc236b6736341 100644 --- a/pulsar-functions/runtime/pom.xml +++ b/pulsar-functions/runtime/pom.xml @@ -22,10 +22,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - 2.8.2 - - org.apache.pulsar pulsar-functions @@ -37,109 +33,6 @@ - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - - ${project.groupId} - pulsar-client-tools-shaded - ${project.version} - - - - org.apache.commons - commons-lang3 - - - commons-codec - commons-codec - - - commons-collections - commons-collections - - - org.asynchttpclient - async-http-client - - - io.netty - netty - - - io.netty - netty-all - - - io.netty - netty-codec-http - - - io.netty - netty-tcnative-boringssl-static - - - io.netty - netty-transport-native-epoll - - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - - - com.google.code.gson - gson - - - net.jpountz.lz4 - lz4 - - - org.apache.httpcomponents - httpcomponents-core - - - org.apache.httpcomponents - httpcomponents-client - - - commons-logging - commons-logging - - - com.yahoo.datasketches - sketches-core - - - - - - org.apache.pulsar - pulsar-functions-proto - ${project.version} - - - - ${project.groupId} - pulsar-functions-api - ${project.version} - - org.apache.pulsar pulsar-functions-instance @@ -152,62 +45,6 @@ ${project.version} - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - - com.fasterxml.jackson.core - jackson-annotations - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.google.code.gson - gson - ${gson.version} - - - - - com.google.protobuf - protobuf-java - 3.5.1 - - - - io.grpc - grpc-all - 1.5.0 - - - - net.jodah - typetools - 0.5.0 - - - - com.yahoo.datasketches - sketches-core - 0.6.0 - - - - com.google.guava - guava - - - - com.beust - jcommander - - diff --git a/pulsar-functions/utils/pom.xml b/pulsar-functions/utils/pom.xml index 0568d5cccf9a3..b71931d90b9a8 100644 --- a/pulsar-functions/utils/pom.xml +++ b/pulsar-functions/utils/pom.xml @@ -22,10 +22,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - 2.8.2 - - org.apache.pulsar pulsar-functions @@ -143,38 +139,21 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.google.code.gson gson - ${gson.version} - - - - - com.google.protobuf - protobuf-java - 3.5.1 - - - - net.jodah - typetools - 0.5.0 diff --git a/pulsar-functions/worker/pom.xml b/pulsar-functions/worker/pom.xml index b653304d4dda5..24f690f4c41d0 100644 --- a/pulsar-functions/worker/pom.xml +++ b/pulsar-functions/worker/pom.xml @@ -39,41 +39,21 @@ org.apache.logging.log4j log4j-slf4j-impl - org.apache.logging.log4j log4j-api - org.apache.logging.log4j log4j-core - - org.apache.pulsar - pulsar-client-tools-shaded - ${project.version} - - ${project.groupId} pulsar-functions-runtime ${project.version} - - org.apache.pulsar - pulsar-functions-proto - ${project.version} - - - - ${project.groupId} - pulsar-functions-metrics - ${project.version} - - org.glassfish.jersey.media jersey-media-json-jackson @@ -109,22 +89,10 @@ jetty-servlet - - com.beust - jcommander - - - - org.inferred - freebuilder - 1.14.6 - - org.apache.distributedlog distributedlog-core-shaded - ${bookkeeper.version}