From 806eab54c5089c9e4dcc0365a800694111e060d2 Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Wed, 25 Sep 2019 21:01:59 -0700 Subject: [PATCH] Removed managed-ledger-shaded artifact (#4200) * Removed managed-ledger-shaded artifact * Fixed dep artifact renaming error --- distribution/offloaders/pom.xml | 2 +- managed-ledger-shaded/pom.xml | 295 ------------------ managed-ledger/pom.xml | 2 +- pom.xml | 1 - pulsar-broker-auth-athenz/pom.xml | 2 +- pulsar-broker-auth-sasl/pom.xml | 2 +- pulsar-broker/pom.xml | 6 +- .../pulsar-client-kafka-tests/pom.xml | 2 +- .../pulsar-client-kafka-tests_0_8/pom.xml | 6 +- .../pulsar-client-kafka-tests_0_9/pom.xml | 2 +- .../pulsar-client-kafka_0_8/pom.xml | 24 +- pulsar-client-tools-test/pom.xml | 2 +- pulsar-discovery-service/pom.xml | 4 +- pulsar-io/debezium/core/pom.xml | 2 +- pulsar-io/kafka-connect-adaptor/pom.xml | 2 +- pulsar-proxy/pom.xml | 2 +- pulsar-sql/presto-pulsar/pom.xml | 4 +- pulsar-testclient/pom.xml | 2 +- pulsar-websocket/pom.xml | 2 +- pulsar-zookeeper-utils/pom.xml | 6 +- tests/integration/pom.xml | 2 +- tests/pulsar-storm-test/pom.xml | 2 +- tiered-storage/file-system/pom.xml | 4 +- tiered-storage/jcloud/pom.xml | 4 +- 24 files changed, 43 insertions(+), 339 deletions(-) delete mode 100644 managed-ledger-shaded/pom.xml diff --git a/distribution/offloaders/pom.xml b/distribution/offloaders/pom.xml index 8656b3179f1ac..825a830a2a914 100644 --- a/distribution/offloaders/pom.xml +++ b/distribution/offloaders/pom.xml @@ -36,7 +36,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} diff --git a/managed-ledger-shaded/pom.xml b/managed-ledger-shaded/pom.xml deleted file mode 100644 index 18be88b266a86..0000000000000 --- a/managed-ledger-shaded/pom.xml +++ /dev/null @@ -1,295 +0,0 @@ - - - - 4.0.0 - - org.apache.pulsar - pulsar - 2.5.0-SNAPSHOT - .. - - - managed-ledger - Managed Ledger - - - - ${project.groupId} - managed-ledger-original - ${project.version} - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - true - true - - - - org.apache.pulsar:pulsar-client-original - org.apache.pulsar:pulsar-client-admin-original - org.apache.pulsar:managed-ledger-original - org.apache.commons:commons-lang3 - commons-codec:commons-codec - commons-collections:commons-collections - org.asynchttpclient:* - io.netty:netty-codec-http - io.netty:netty-transport-native-epoll - org.reactivestreams:reactive-streams - com.typesafe.netty:netty-reactive-streams - org.javassist:javassist - com.google.protobuf:protobuf-java - com.google.guava:guava - com.google.code.gson:gson - com.fasterxml.jackson.core - io.netty:netty - io.netty:netty-all - org.apache.pulsar:pulsar-common - com.yahoo.datasketches:sketches-core - org.glassfish.jersey*:* - javax.ws.rs:* - javax.annotation:* - org.glassfish.hk2*:* - com.fasterxml.jackson.*:* - io.grpc:* - com.yahoo.datasketches:* - io.netty:* - com.squareup.*:* - com.google.*:* - commons-*:* - org.apache.httpcomponents:* - org.eclipse.jetty:* - com.google.auth:* - org.jvnet.mimepull:* - io.opencensus:* - org.apache.zookeeper:* - org.apache.commons:* - net.java.dev.jna:jna - org.apache.yetus:audience-annotations - org.apache.bookkeeper*:* - - org.apache.avro:* - - org.codehaus.jackson:jackson-core-asl - org.codehaus.jackson:jackson-mapper-asl - com.thoughtworks.paranamer:paranamer - org.xerial.snappy:snappy-java - org.apache.commons:commons-compress - org.tukaani:xz - - - - - org.apache.pulsar:pulsar-client-original - - ** - - - - - - org.asynchttpclient - org.apache.pulsar.shade.org.asynchttpclient - - - org.apache.commons - org.apache.pulsar.shade.org.apache.commons - - - com.google - org.apache.pulsar.shade.com.google - - com.google.protobuf.* - - - - com.fasterxml.jackson - org.apache.pulsar.shade.com.fasterxml.jackson - - - io.netty - org.apache.pulsar.shade.io.netty - - - org.apache.pulsar.policies - org.apache.pulsar.shade.org.apache.pulsar.policies - - - org.apache.pulsar.checksum - org.apache.pulsar.shade.org.apache.pulsar.checksum - - - com.yahoo - org.apache.pulsar.shade.com.yahoo - - - com.typesafe - org.apache.pulsar.shade.com.typesafe - - - org.glassfish - org.apache.pulsar.shade.org.glassfish - - - javax.ws - org.apache.pulsar.shade.javax.ws - - - javax.annotation - org.apache.pulsar.shade.javax.annotation - - - jersey - org.apache.pulsar.shade.jersey - - - org.jvnet - org.apache.pulsar.shade.org.jvnet - - - org.aopalliance - org.apache.pulsar.shade.org.aopalliance - - - javassist - org.apache.pulsar.shade.javassist - - - javax.inject - org.apache.pulsar.shade.javax.inject - - - org.reactivestreams - org.apache.pulsar.shade.org.reactivestreams - - - org.apache.avro - org.apache.pulsar.shade.org.apache.avro - - - - org.codehaus.jackson - org.apache.pulsar.shade.org.codehaus.jackson - - - com.thoughtworks.paranamer - org.apache.pulsar.shade.com.thoughtworks.paranamer - - - org.xerial.snappy - org.apache.pulsar.shade.org.xerial.snappy - - - org.tukaani - org.apache.pulsar.shade.org.tukaani - - - io.grpc - org.apache.pulsar.shade.io.grpc - - - okio - org.apache.pulsar.shade.okio - - - com.squareup - org.apache.pulsar.shade.com.squareup - - - io.opencensus - org.apache.pulsar.shade.io.opencensus - - - org.eclipse.jetty - org.apache.pulsar.shade.org.eclipse.jetty - - - org.apache.http - org.apache.pulsar.shade.org.apache.http - - - org.apache.bookkeeper - org.apache.pulsar.shade.org.apache.bookkeeper - - org.apache.bookkeeper.mledger.** - - - - org.apache.zookeeper - org.apache.pulsar.shade.org.apache.zookeeper - - - net.java.dev.jna - org.apache.pulsar.shade.net.java.dev.jna - - - org.apache.yetus - org.apache.pulsar.shade.org.apache.yetus - - - - - - - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - rename-epoll-library - package - - exec - - - ${project.parent.basedir}/src/${rename.netty.native.libs} - - ${project.artifactId} - - - - - - - - diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml index 9ea7752547778..be973929283d7 100644 --- a/managed-ledger/pom.xml +++ b/managed-ledger/pom.xml @@ -29,7 +29,7 @@ .. - managed-ledger-original + managed-ledger Managed Ledger diff --git a/pom.xml b/pom.xml index 4c722e722e996..e577ca714ffcf 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,6 @@ flexible messaging model and an intuitive client API. buildtools managed-ledger - managed-ledger-shaded tiered-storage pulsar-common pulsar-broker-common diff --git a/pulsar-broker-auth-athenz/pom.xml b/pulsar-broker-auth-athenz/pom.xml index bea716dd14b21..47781b21144b5 100644 --- a/pulsar-broker-auth-athenz/pom.xml +++ b/pulsar-broker-auth-athenz/pom.xml @@ -43,7 +43,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/pulsar-broker-auth-sasl/pom.xml b/pulsar-broker-auth-sasl/pom.xml index e8bfbc9e9eca0..68ad738a5d8b3 100644 --- a/pulsar-broker-auth-sasl/pom.xml +++ b/pulsar-broker-auth-sasl/pom.xml @@ -84,7 +84,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 437b0abe69ddb..ccfb0277361dc 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -98,7 +98,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} @@ -116,7 +116,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test @@ -192,7 +192,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - + org.glassfish.jersey.inject jersey-hk2 diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml index 6c59648d84f96..5cb558244460e 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml @@ -60,7 +60,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test test-jar diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml index 8b9a0097ed036..151ad4a12ea4c 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml @@ -60,18 +60,18 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test test-jar - + com.beust jcommander test - + diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml index c63c8dc74f786..1d82041b79fd6 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml @@ -60,7 +60,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test test-jar diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml index dbc1108e709d4..2a297ef87b1af 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml @@ -30,7 +30,7 @@ 2.5.0-SNAPSHOT .. - + 0.8.1.1 @@ -41,22 +41,22 @@ Kafka client library that publishes and consumes messages on Pulsar topics - + ${project.groupId} pulsar-broker ${project.version} test - - + + ${project.groupId} pulsar-common ${project.version} test - + ${project.groupId} pulsar-broker @@ -64,33 +64,33 @@ test-jar test - + ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test - - + + ${project.groupId} pulsar-client ${project.version} - + ${project.groupId} pulsar-client-admin ${project.version} - + org.apache.commons commons-lang3 - + com.google.guava guava diff --git a/pulsar-client-tools-test/pom.xml b/pulsar-client-tools-test/pom.xml index a632c2e3e57c0..b8b22eb0c3f04 100644 --- a/pulsar-client-tools-test/pom.xml +++ b/pulsar-client-tools-test/pom.xml @@ -40,7 +40,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/pulsar-discovery-service/pom.xml b/pulsar-discovery-service/pom.xml index 513cf346b9bc6..ff3e3d498967c 100644 --- a/pulsar-discovery-service/pom.xml +++ b/pulsar-discovery-service/pom.xml @@ -52,14 +52,14 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.parent.version} test ${project.groupId} - managed-ledger-original + managed-ledger ${project.parent.version} test-jar test diff --git a/pulsar-io/debezium/core/pom.xml b/pulsar-io/debezium/core/pom.xml index 8ec77e4c1e149..798e5777e71a0 100644 --- a/pulsar-io/debezium/core/pom.xml +++ b/pulsar-io/debezium/core/pom.xml @@ -77,7 +77,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/pulsar-io/kafka-connect-adaptor/pom.xml b/pulsar-io/kafka-connect-adaptor/pom.xml index 449735085d6c4..4796ead5352ed 100644 --- a/pulsar-io/kafka-connect-adaptor/pom.xml +++ b/pulsar-io/kafka-connect-adaptor/pom.xml @@ -84,7 +84,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml index d7ff9ed3facea..5dc6e1bc64252 100644 --- a/pulsar-proxy/pom.xml +++ b/pulsar-proxy/pom.xml @@ -151,7 +151,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/pulsar-sql/presto-pulsar/pom.xml b/pulsar-sql/presto-pulsar/pom.xml index 3fe72dd68a4e0..2f3d4fd960e22 100644 --- a/pulsar-sql/presto-pulsar/pom.xml +++ b/pulsar-sql/presto-pulsar/pom.xml @@ -65,7 +65,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} @@ -123,7 +123,7 @@ org.apache.pulsar:pulsar-client-original org.apache.pulsar:pulsar-client-admin-original - org.apache.pulsar:managed-ledger-original + org.apache.pulsar:managed-ledger org.glassfish.jersey*:* javax.ws.rs:* diff --git a/pulsar-testclient/pom.xml b/pulsar-testclient/pom.xml index 32572a29ff857..11558c22563b2 100644 --- a/pulsar-testclient/pom.xml +++ b/pulsar-testclient/pom.xml @@ -36,7 +36,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/pulsar-websocket/pom.xml b/pulsar-websocket/pom.xml index caebc56f09344..e880d89a3fed9 100644 --- a/pulsar-websocket/pom.xml +++ b/pulsar-websocket/pom.xml @@ -47,7 +47,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.parent.version} test diff --git a/pulsar-zookeeper-utils/pom.xml b/pulsar-zookeeper-utils/pom.xml index 05b0a57001905..207a27a70a3d6 100644 --- a/pulsar-zookeeper-utils/pom.xml +++ b/pulsar-zookeeper-utils/pom.xml @@ -80,7 +80,7 @@ ${project.groupId} - managed-ledger-original + managed-ledger tests test ${project.parent.version} @@ -105,14 +105,14 @@ ${project.groupId} - managed-ledger-original + managed-ledger ${project.parent.version} test ${project.groupId} - managed-ledger-original + managed-ledger ${project.parent.version} test-jar test diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 486bea0e64daf..32e8144a3ef39 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -67,7 +67,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} test diff --git a/tests/pulsar-storm-test/pom.xml b/tests/pulsar-storm-test/pom.xml index 446117719d4f2..584280d0461df 100644 --- a/tests/pulsar-storm-test/pom.xml +++ b/tests/pulsar-storm-test/pom.xml @@ -82,7 +82,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/tiered-storage/file-system/pom.xml b/tiered-storage/file-system/pom.xml index bc47aae97f839..0a2051f914681 100644 --- a/tiered-storage/file-system/pom.xml +++ b/tiered-storage/file-system/pom.xml @@ -34,7 +34,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} @@ -54,7 +54,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} test-jar test diff --git a/tiered-storage/jcloud/pom.xml b/tiered-storage/jcloud/pom.xml index ba4fb0de29e31..4948d0c81b839 100644 --- a/tiered-storage/jcloud/pom.xml +++ b/tiered-storage/jcloud/pom.xml @@ -35,7 +35,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} @@ -84,7 +84,7 @@ org.apache.pulsar - managed-ledger-original + managed-ledger ${project.version} test-jar test