Skip to content

Commit 22b17c3

Browse files
xiangfu0xiangfu0
authored
adding scala profile for kafka 2.x build and remove root pom scala dependencies (#8174)
1 parent 6df4b66 commit 22b17c3

File tree

4 files changed

+89
-25
lines changed
  • pinot-connectors/pinot-spark-connector
  • pinot-plugins
    • pinot-batch-ingestion/v0_deprecated/pinot-spark
    • pinot-stream-ingestion/pinot-kafka-2.0
  • pom.xml

4 files changed

+89
-25
lines changed

‎pinot-connectors/pinot-spark-connector/pom.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,22 @@
6969
<groupId>com.thoughtworks.paranamer</groupId>
7070
<artifactId>paranamer</artifactId>
7171
</exclusion>
72+
<exclusion>
73+
<groupId>org.scala-lang</groupId>
74+
<artifactId>scala-library</artifactId>
75+
</exclusion>
7276
</exclusions>
7377
</dependency>
7478
<dependency>
7579
<groupId>org.scala-lang.modules</groupId>
7680
<artifactId>scala-xml_${scala.compat.version}</artifactId>
7781
<version>${scalaxml.version}</version>
82+
<exclusions>
83+
<exclusion>
84+
<groupId>org.scala-lang</groupId>
85+
<artifactId>scala-library</artifactId>
86+
</exclusion>
87+
</exclusions>
7888
</dependency>
7989
<dependency>
8090
<groupId>org.apache.spark</groupId>
@@ -98,17 +108,33 @@
98108
<groupId>org.scala-lang.modules</groupId>
99109
<artifactId>scala-xml_${scala.compat.version}</artifactId>
100110
</exclusion>
111+
<exclusion>
112+
<groupId>org.scala-lang</groupId>
113+
<artifactId>scala-library</artifactId>
114+
</exclusion>
101115
</exclusions>
102116
</dependency>
103117
<dependency>
104118
<groupId>io.circe</groupId>
105119
<artifactId>circe-parser_${scala.compat.version}</artifactId>
106120
<version>${circe.version}</version>
121+
<exclusions>
122+
<exclusion>
123+
<groupId>org.scala-lang</groupId>
124+
<artifactId>scala-library</artifactId>
125+
</exclusion>
126+
</exclusions>
107127
</dependency>
108128
<dependency>
109129
<groupId>io.circe</groupId>
110130
<artifactId>circe-generic_${scala.compat.version}</artifactId>
111131
<version>${circe.version}</version>
132+
<exclusions>
133+
<exclusion>
134+
<groupId>org.scala-lang</groupId>
135+
<artifactId>scala-library</artifactId>
136+
</exclusion>
137+
</exclusions>
112138
</dependency>
113139
<dependency>
114140
<groupId>org.scala-lang</groupId>
@@ -127,6 +153,10 @@
127153
<groupId>org.scala-lang.modules</groupId>
128154
<artifactId>scala-xml_${scala.compat.version}</artifactId>
129155
</exclusion>
156+
<exclusion>
157+
<groupId>org.scala-lang</groupId>
158+
<artifactId>scala-library</artifactId>
159+
</exclusion>
130160
</exclusions>
131161
</dependency>
132162
</dependencies>

‎pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,14 @@
385385
<groupId>commons-pool</groupId>
386386
<artifactId>commons-pool</artifactId>
387387
</exclusion>
388+
<exclusion>
389+
<groupId>org.scala-lang</groupId>
390+
<artifactId>scala-library</artifactId>
391+
</exclusion>
392+
<exclusion>
393+
<groupId>org.scala-lang</groupId>
394+
<artifactId>scala-reflect</artifactId>
395+
</exclusion>
388396
</exclusions>
389397
<scope>test</scope>
390398
</dependency>
@@ -435,6 +443,17 @@
435443
<artifactId>scala-xml_${scala.binary.version}</artifactId>
436444
<version>1.0.6</version>
437445
<scope>test</scope>
446+
<exclusions>
447+
<exclusion>
448+
<groupId>org.scala-lang</groupId>
449+
<artifactId>scala-library</artifactId>
450+
</exclusion>
451+
</exclusions>
452+
</dependency>
453+
<dependency>
454+
<groupId>org.scala-lang</groupId>
455+
<artifactId>scala-reflect</artifactId>
456+
<version>${scala.version}</version>
438457
</dependency>
439458
<dependency>
440459
<groupId>org.apache.spark</groupId>
@@ -453,6 +472,10 @@
453472
<groupId>org.apache.curator</groupId>
454473
<artifactId>curator-recipes</artifactId>
455474
</exclusion>
475+
<exclusion>
476+
<groupId>org.scala-lang</groupId>
477+
<artifactId>scala-library</artifactId>
478+
</exclusion>
456479
</exclusions>
457480
</dependency>
458481
<dependency>
@@ -488,6 +511,10 @@
488511
<groupId>org.apache.orc</groupId>
489512
<artifactId>orc-core</artifactId>
490513
</exclusion>
514+
<exclusion>
515+
<groupId>org.scala-lang</groupId>
516+
<artifactId>scala-reflect</artifactId>
517+
</exclusion>
491518
</exclusions>
492519
<scope>test</scope>
493520
</dependency>
@@ -504,6 +531,14 @@
504531
<groupId>org.objenesis</groupId>
505532
<artifactId>objenesis</artifactId>
506533
</exclusion>
534+
<exclusion>
535+
<groupId>org.scala-lang</groupId>
536+
<artifactId>scala-library</artifactId>
537+
</exclusion>
538+
<exclusion>
539+
<groupId>org.scala-lang</groupId>
540+
<artifactId>scala-reflect</artifactId>
541+
</exclusion>
507542
</exclusions>
508543
<scope>test</scope>
509544
</dependency>

‎pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
<properties>
3737
<pinot.root>${basedir}/../../..</pinot.root>
3838
<kafka.lib.version>2.8.1</kafka.lib.version>
39-
<scala.compat.version>2.13</scala.compat.version>
40-
<scala.version>2.13.3</scala.version>
4139
<phase.prop>package</phase.prop>
4240
</properties>
4341

@@ -100,4 +98,28 @@
10098
<artifactId>jopt-simple</artifactId>
10199
</dependency>
102100
</dependencies>
101+
102+
103+
<profiles>
104+
<profile>
105+
<id>scala-2.12</id>
106+
<activation>
107+
<activeByDefault>true</activeByDefault>
108+
</activation>
109+
<properties>
110+
<scala.version>2.12.11</scala.version>
111+
<scala.compat.version>2.12</scala.compat.version>
112+
</properties>
113+
</profile>
114+
<profile>
115+
<id>scala-2.13</id>
116+
<activation>
117+
<activeByDefault>false</activeByDefault>
118+
</activation>
119+
<properties>
120+
<scala.version>2.13.3</scala.version>
121+
<scala.compat.version>2.13</scala.compat.version>
122+
</properties>
123+
</profile>
124+
</profiles>
103125
</project>

‎pom.xml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
<hk2.version>2.5.0</hk2.version>
130130
<swagger.version>1.5.16</swagger.version>
131131
<hadoop.version>2.7.0</hadoop.version>
132-
<scala.version>2.13.3</scala.version>
133132
<antlr.version>4.6</antlr.version>
134133
<jsonpath.version>2.7.0</jsonpath.version>
135134
<quartz.version>2.3.2</quartz.version>
@@ -921,28 +920,6 @@
921920
<scope>provided</scope>
922921
</dependency>
923922

924-
<!-- Scala -->
925-
<dependency>
926-
<groupId>org.scala-lang</groupId>
927-
<artifactId>scala-library</artifactId>
928-
<version>${scala.version}</version>
929-
</dependency>
930-
<dependency>
931-
<groupId>org.scala-lang</groupId>
932-
<artifactId>scala-reflect</artifactId>
933-
<version>${scala.version}</version>
934-
</dependency>
935-
<dependency>
936-
<groupId>org.scala-lang</groupId>
937-
<artifactId>scala-compiler</artifactId>
938-
<version>${scala.version}</version>
939-
</dependency>
940-
<dependency>
941-
<groupId>org.scala-lang</groupId>
942-
<artifactId>scala-scalap</artifactId>
943-
<version>${scala.version}</version>
944-
</dependency>
945-
946923
<!-- Metrics -->
947924
<dependency>
948925
<groupId>io.dropwizard.metrics</groupId>

0 commit comments

Comments
 (0)