Skip to content

Commit

Permalink
Removed managed-ledger-shaded artifact (apache#4200)
Browse files Browse the repository at this point in the history 
* Removed managed-ledger-shaded artifact

* Fixed dep artifact renaming error
  • Loading branch information
@merlimat
merlimat authored Sep 26, 2019
1 parent d430441 commit 806eab5
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 339 deletions.
2 changes: 1 addition & 1 deletion distribution/offloaders/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
295 changes: 0 additions & 295 deletions managed-ledger-shaded/pom.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion managed-ledger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<relativePath>..</relativePath>
</parent>

<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<name>Managed Ledger</name>

<dependencies>
Expand Down
1 change: 0 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ flexible messaging model and an intuitive client API.</description>
<modules>
<module>buildtools</module>
<module>managed-ledger</module>
<module>managed-ledger-shaded</module>
<module>tiered-storage</module>
<module>pulsar-common</module>
<module>pulsar-broker-common</module>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-auth-athenz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker-auth-sasl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
6 changes: 3 additions & 3 deletions pulsar-broker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -116,7 +116,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down Expand Up @@ -192,7 +192,7 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
Expand Down
6 changes: 3 additions & 3 deletions pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

</project>
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
Expand Down
24 changes: 12 additions & 12 deletions pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<properties>
<kafka_0_8.version>0.8.1.1</kafka_0_8.version>
</properties>
Expand All @@ -41,56 +41,56 @@
<description>Kafka client library that publishes and consumes messages on Pulsar topics</description>

<dependencies>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>


<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>


<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-client</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-client-admin</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-tools-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions pulsar-discovery-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-io/debezium/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-io/kafka-connect-adaptor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-proxy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions pulsar-sql/presto-pulsar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -123,7 +123,7 @@
<includes>
<include>org.apache.pulsar:pulsar-client-original</include>
<include>org.apache.pulsar:pulsar-client-admin-original</include>
<include>org.apache.pulsar:managed-ledger-original</include>
<include>org.apache.pulsar:managed-ledger</include>

<include>org.glassfish.jersey*:*</include>
<include>javax.ws.rs:*</include>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-testclient/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-websocket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions pulsar-zookeeper-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
<version>${project.parent.version}</version>
Expand All @@ -105,14 +105,14 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion tests/pulsar-storm-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions tiered-storage/file-system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions tiered-storage/jcloud/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<artifactId>managed-ledger</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down

0 comments on commit 806eab5

Please sign in to comment.