This is an automated email from the ASF dual-hosted git repository.
lqc pushed a commit to branch release-1.4.0-rc
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/release-1.4.0-rc by this push:
new 02a07aa27e7 update license with temp changes
02a07aa27e7 is described below
commit 02a07aa27e78424f2da0a671cf82268ef4edd8fe
Author: deemoliu <[email protected]>
AuthorDate: Tue Aug 19 17:37:01 2025 -0700
update license with temp changes
---
pinot-connectors/pinot-spark-2-connector/pom.xml | 24 +--
pinot-connectors/pinot-spark-3-connector/pom.xml | 24 +--
pinot-distribution/pom.xml | 202 +++++++++++++++++++++++
pinot-perf/pom.xml | 22 ---
pom.xml | 107 +++++-------
5 files changed, 245 insertions(+), 134 deletions(-)
diff --git a/pinot-connectors/pinot-spark-2-connector/pom.xml
b/pinot-connectors/pinot-spark-2-connector/pom.xml
index 3fef7844061..972bf6fbc13 100644
--- a/pinot-connectors/pinot-spark-2-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-2-connector/pom.xml
@@ -42,29 +42,7 @@
</activation>
<build>
<plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <relocations>
- <relocation>
- <pattern>com</pattern>
- <shadedPattern>${shadeBase}.com</shadedPattern>
- <includes>
- <include>com.google.protobuf.**</include>
- <include>com.google.common.**</include>
- </includes>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
</profile>
diff --git a/pinot-connectors/pinot-spark-3-connector/pom.xml
b/pinot-connectors/pinot-spark-3-connector/pom.xml
index 2f1ce1dec3a..3461f8578ad 100644
--- a/pinot-connectors/pinot-spark-3-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-3-connector/pom.xml
@@ -40,29 +40,7 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <relocations>
- <relocation>
- <pattern>com</pattern>
- <shadedPattern>${shadeBase}.com</shadedPattern>
- <includes>
- <include>com.google.protobuf.**</include>
- <include>com.google.common.**</include>
- </includes>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
</profile>
diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml
index a50a73f6963..8c30e15ad13 100644
--- a/pinot-distribution/pom.xml
+++ b/pinot-distribution/pom.xml
@@ -21,6 +21,7 @@
-->
<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
<parent>
<artifactId>pinot</artifactId>
<groupId>org.apache.pinot</groupId>
@@ -43,6 +44,207 @@
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-jdbc-client</artifactId>
</dependency>
+ <!-- pinot-plugins/pinot-batch-ingestion -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-batch-ingestion-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-batch-ingestion-hadoop</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-batch-ingestion-spark-2.4</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-batch-ingestion-spark-3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-batch-ingestion-spark-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-batch-ingestion-standalone</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-environment -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-azure</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-file-system -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-adls</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-gcs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-hdfs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-s3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-input-format -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-avro-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-avro</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-clp-log</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-confluent-avro</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-confluent-json</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-confluent-protobuf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-csv</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-json</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-orc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-parquet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-protobuf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-thrift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-metrics -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-dropwizard</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-yammer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-compound-metrics</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-minion-tasks -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-minion-builtin-tasks</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-segment-uploader -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-segment-uploader-default</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-segment-writer -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-segment-writer-file-based</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-stream-ingestion -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-kafka-2.0</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-kafka-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-kinesis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-pulsar</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-plugins/pinot-timeseries-lang -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-timeseries-m3ql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- pinot-connectors -->
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-flink-connector</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-spark-2-connector</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-spark-3-connector</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-spark-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/pinot-perf/pom.xml b/pinot-perf/pom.xml
index ae688185a5a..747bfdbe0a5 100644
--- a/pinot-perf/pom.xml
+++ b/pinot-perf/pom.xml
@@ -229,28 +229,6 @@
</activation>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <!-- Run shade goal on package phase -->
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <transformers>
- <!-- add Main-Class to manifest file -->
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.openjdk.jmh.Main</mainClass>
- </transformer>
- </transformers>
- <finalName>benchmarks</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/pom.xml b/pom.xml
index b68d1cd07f7..732101ff7fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1326,6 +1326,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- OpenTelemetry BOMs to align OTEL across transitive dependencies
(e.g., Pulsar, Google Cloud Storage) -->
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-bom</artifactId>
+ <version>1.47.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-bom-alpha</artifactId>
+ <version>1.47.0-alpha</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service-annotations</artifactId>
@@ -2153,6 +2168,31 @@
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <artifactSet>
+ <includes>
+ <include>*:*</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
@@ -2859,72 +2899,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
-
<artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
- <version>0.2.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>${shade.phase.prop}</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <transformers>
- <!-- See https://logging.apache.org/log4j/transform for details -->
- <transformer
implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"
/>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>${mainClass}</mainClass>
- <manifestEntries>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </transformer>
- </transformers>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <!-- Exclude signed manifests -->
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
-
- <!-- See https://github.com/apache/pinot/issues/11974 for
details -->
- <exclude>module-info.class</exclude>
-
- <!-- Solve NoClassDefFoundError. Borrowed from
https://github.com/prometheus/jmx_exporter/issues/802 -->
-
<exclude>META-INF/versions/9/org/yaml/snakeyaml/internal/**</exclude>
- </excludes>
- </filter>
- </filters>
- <relocations>
- <relocation>
- <pattern>com.fasterxml.jackson</pattern>
-
<shadedPattern>${shade.prefix}.com.fasterxml.jackson</shadedPattern>
- </relocation>
- <relocation>
- <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>
+
<!-- Include apache LICENSE, NOTICE files for jar resource bundle -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
