Skip to content

Commit

Permalink
[improve][build] Remove invalid relativePath definitions in pom.xml f…
Browse files Browse the repository at this point in the history
…iles (apache#22741)

### Motivation

Using `<relativePath>..</relativePath>` is invalid, it should be `<relativePath>../pom.xml</relativePath>`.
Since the default for `relativePath` value is `../pom.xml`, there's no need to include the relativePath definition when it's `../pom.xml`.

### Modifications

- remove `relativePath` elements from `pom.xml` files when the value is `..` or `../pom.xml`.
  • Loading branch information
lhotari committed May 18, 2024
1 parent 2308f27 commit 4593cc3
Show file tree
Hide file tree
Showing 45 changed files with 6 additions and 51 deletions.
1 change: 0 additions & 1 deletion bouncy-castle/bc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>bouncy-castle-bc</artifactId>
Expand Down
1 change: 0 additions & 1 deletion bouncy-castle/bcfips-include-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>bcfips-include-test</artifactId>
Expand Down
1 change: 0 additions & 1 deletion bouncy-castle/bcfips/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>bouncy-castle-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>bouncy-castle-bcfips</artifactId>
Expand Down
1 change: 0 additions & 1 deletion bouncy-castle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<build>
Expand Down
1 change: 0 additions & 1 deletion distribution/io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>distribution</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-io-distribution</artifactId>
Expand Down
1 change: 0 additions & 1 deletion distribution/offloaders/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>distribution</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-offloader-distribution</artifactId>
Expand Down
1 change: 0 additions & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>distribution</artifactId>
Expand Down
1 change: 0 additions & 1 deletion distribution/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>distribution</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-server-distribution</artifactId>
Expand Down
1 change: 0 additions & 1 deletion distribution/shell/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>distribution</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-shell-distribution</artifactId>
Expand Down
1 change: 0 additions & 1 deletion jclouds-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>jclouds-shaded</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions managed-ledger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>managed-ledger</artifactId>
Expand Down Expand Up @@ -147,7 +146,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion microbench/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>microbench</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>pulsar-broker</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions pulsar-cli-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-cli-utils</artifactId>
Expand Down Expand Up @@ -73,7 +72,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
Expand Down Expand Up @@ -112,7 +111,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-1x-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-1x-base</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-1x-base/pulsar-client-1x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-1x-base</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-1x</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-1x-base/pulsar-client-2x-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-1x-base</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-2x-shaded</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions pulsar-client-admin-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-admin-api</artifactId>
Expand All @@ -43,7 +42,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-admin-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-admin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-admin-original</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-all</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-api</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-auth-athenz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-auth-athenz</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-auth-sasl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-auth-sasl</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-messagecrypto-bc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-messagecrypto-bc</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-tools-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-tools-api</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-tools-customcommand-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-client-tools-customcommand-example</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-tools-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-tools-test</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-tools</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-client-original</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-common</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions pulsar-config-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-config-validation</artifactId>
Expand Down Expand Up @@ -59,7 +58,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-functions/localrun-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-functions</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-functions-local-runner</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-functions/localrun/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-functions</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-functions-local-runner-original</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-functions/runtime-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-functions</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<!--
Expand Down
3 changes: 1 addition & 2 deletions pulsar-functions/worker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-functions</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-functions-worker</artifactId>
Expand Down Expand Up @@ -223,7 +222,7 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Expand Down
1 change: 0 additions & 1 deletion pulsar-metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
1 change: 0 additions & 1 deletion pulsar-package-management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<artifactId>pulsar</artifactId>
<groupId>org.apache.pulsar</groupId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
1 change: 0 additions & 1 deletion pulsar-testclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-testclient</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pulsar-websocket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>pulsar-websocket</artifactId>
Expand Down
1 change: 0 additions & 1 deletion structured-event-log/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>structured-event-log</artifactId>
Expand Down
1 change: 0 additions & 1 deletion tiered-storage/file-system/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>tiered-storage-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>tiered-storage-file-system</artifactId>
Expand Down

0 comments on commit 4593cc3

Please sign in to comment.