This is an automated email from the ASF dual-hosted git repository.
siddteotia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new d7b17630a6 [Issue 12676 - Part 2.2] Define versions from submodule
POMs in root POM (#15501)
d7b17630a6 is described below
commit d7b17630a60bf2736ee4a25a81ccedd33bc7f728
Author: Eujean Lee <[email protected]>
AuthorDate: Wed Apr 9 10:26:50 2025 -0700
[Issue 12676 - Part 2.2] Define versions from submodule POMs in root POM
(#15501)
* define versions from submodule POMs in root POM
* shade org.scala-lang
---
pinot-common/pom.xml | 2 +-
pinot-plugins/pinot-file-system/pinot-s3/pom.xml | 1 -
pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml | 2 +-
pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml | 1 -
pom.xml | 8 ++++++++
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index b967e57cca..e53d21d6fa 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -419,7 +419,7 @@
<dependency>
<groupId>net.sourceforge.fmpp</groupId>
<artifactId>fmpp</artifactId>
- <version>0.9.16</version>
+ <version>${fmpp.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
b/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
index 5976abd45b..89bc877f2c 100644
--- a/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
@@ -32,7 +32,6 @@
<url>https://pinot.apache.org</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
- <s3mock.version>2.17.0</s3mock.version>
</properties>
<dependencies>
diff --git a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
index e83300f805..34b88c7f56 100644
--- a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>com.github.os72</groupId>
<artifactId>protobuf-dynamic</artifactId>
- <version>1.0.1</version>
+ <version>${protobuf-dynamic.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
index 3a542d7c4d..42063506fa 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
@@ -32,7 +32,6 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
- <localstack-utils.version>0.2.23</localstack-utils.version>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 580e3b2615..fc1c7da071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,6 +185,10 @@
<jbcrypt.version>0.4</jbcrypt.version>
<plexus-classworlds.version>2.9.0</plexus-classworlds.version>
<scala-xml.version>2.3.0</scala-xml.version>
+ <fmpp.version>0.9.16</fmpp.version>
+ <s3mock.version>2.17.0</s3mock.version>
+ <localstack-utils.version>0.2.23</localstack-utils.version>
+ <protobuf-dynamic.version>1.0.1</protobuf-dynamic.version>
<spark2.version>2.4.8</spark2.version>
<spark3.version>3.5.3</spark3.version>
@@ -2851,6 +2855,10 @@
<pattern>com.google.common</pattern>
<shadedPattern>${shade.prefix}.com.google.common</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.scala-lang</pattern>
+ <shadedPattern>${shade.prefix}.org.scala-lang</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
