You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/02/09 16:33:32 UTC
[pulsar] branch master updated: Remove two unused shaded modules
(#3559)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new f11e994 Remove two unused shaded modules (#3559)
f11e994 is described below
commit f11e99454644df97d0aa869256204c0b60508396
Author: Sijie Guo <gu...@gmail.com>
AuthorDate: Sun Feb 10 00:33:23 2019 +0800
Remove two unused shaded modules (#3559)
*Motivation*
There are a few shaded modules introduced when functions was introduced.
They are not needed anymore. We should remove them.
*Modifications*
Remote those unused modules.
---
pulsar-functions/pom.xml | 2 -
pulsar-functions/proto-shaded/pom.xml | 86 ----------------
pulsar-functions/runtime-shaded/pom.xml | 176 --------------------------------
3 files changed, 264 deletions(-)
diff --git a/pulsar-functions/pom.xml b/pulsar-functions/pom.xml
index 06ceca5..a101a87 100644
--- a/pulsar-functions/pom.xml
+++ b/pulsar-functions/pom.xml
@@ -33,13 +33,11 @@
<modules>
<module>proto</module>
- <module>proto-shaded</module>
<module>api-java</module>
<module>java-examples</module>
<module>utils</module>
<module>instance</module>
<module>runtime</module>
- <module>runtime-shaded</module>
<module>runtime-all</module>
<module>worker</module>
<module>secrets</module>
diff --git a/pulsar-functions/proto-shaded/pom.xml b/pulsar-functions/proto-shaded/pom.xml
deleted file mode 100644
index ab5c010..0000000
--- a/pulsar-functions/proto-shaded/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>pulsar-functions-proto-shaded</artifactId>
- <name>Pulsar Functions :: Proto-shaded</name>
-
- <dependencies>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf3.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-functions-proto</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <minimizeJar>false</minimizeJar>
- <artifactSet>
- <includes>
- <include>com.google.protobuf*:*</include>
- <include>${project.groupId}:pulsar-functions-proto</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>com.google.protobuf</pattern>
- <shadedPattern>org.apache.pulsar.functions.shaded.com.google.protobuf</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.pulsar.functions.proto</pattern>
- <shadedPattern>org.apache.pulsar.functions.shaded.proto</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-</project>
diff --git a/pulsar-functions/runtime-shaded/pom.xml b/pulsar-functions/runtime-shaded/pom.xml
deleted file mode 100644
index b725bb2..0000000
--- a/pulsar-functions/runtime-shaded/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-functions</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>pulsar-functions-runtime-shaded</artifactId>
- <name>Pulsar Functions :: Runtime Shaded</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-functions-runtime</artifactId>
- <version>${project.parent.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.bookkeeper.stats</groupId>
- <artifactId>bookkeeper-stats-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.1.12.Final</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <minimizeJar>false</minimizeJar>
-
- <artifactSet>
- <includes>
- <include>com.google.protobuf:protobuf-lite</include>
- <include>com.google.protobuf:protobuf-java</include>
- <include>com.google.protobuf.nano:protobuf-javanano</include>
- <include>com.google.protobuf:protobuf-java-util</include>
- <include>com.google.instrumentation:instrumentation-api</include>
- <include>com.google.api.grpc:proto-google-common-protos</include>
- <include>com.google.auth:google-auth-library-credentials</include>
- <include>com.google.errorprone:error_prone_annotations</include>
- <include>com.squareup.okhttp:okhttp</include>
- <include>com.squareup.okio:okio</include>
- <include>org.inferred:freebuilder</include>
- <include>com.google.googlejavaformat:google-java-format</include>
- <include>com.google.errorprone:javac</include>
- <include>net.jodah:typetools</include>
- <include>com.beust:jcommander</include>
- <include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</include>
- <include>org.yaml:snakeyaml</include>
- <!-- dependencies use protobuf -->
- <include>org.apache.pulsar:pulsar-functions-proto</include>
- <include>org.apache.pulsar:pulsar-functions-utils</include>
- <include>org.apache.pulsar:pulsar-functions-instance</include>
- <include>org.apache.pulsar:pulsar-functions-runtime</include>
- <include>org.apache.pulsar:pulsar-functions-api</include>
- <!-- protobuf dependencies in grpc -->
- <include>io.grpc:*</include>
- <!-- bookkeeper key/value service -->
- <include>org.apache.bookkeeper:stream-storage-java-client</include>
- <include>io.netty:netty-all</include>
-
- <!-- dependencies to include when using shaded pulsar client-->
- <!--
- <include>com.fasterxml.jackson.core:jackson-core</include>
- <include>com.fasterxml.jackson.core:jackson-databind</include>
- <include>com.fasterxml.jackson.core:jackson-annotations</include>
- <include>org.apache.commons:commons-lang3</include>
- <include>com.yahoo.datasketches:sketches-core</include>
- <include>com.google.guava:guava</include>
- <include>org.apache.bookkeeper:bookkeeper-common</include>
- <include>org.apache.bookkeeper.stats:bookkeeper-stats-api</include>
- <include>com.google.code.gson:gson</include>
- -->
- </includes>
- </artifactSet>
- <relocations>
- <!-- bookkeeper shading rule -->
- <relocation>
- <pattern>com.google.protobuf</pattern>
- <shadedPattern>org.apache.pulsar.functions.shaded.com.google.protobuf</shadedPattern>
- </relocation>
- <relocation>
- <pattern>io.netty</pattern>
- <shadedPattern>org.apache.pulsar.functions.shaded.io.netty</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>