-
Notifications
You must be signed in to change notification settings - Fork 209
[AURON #2013] Auto-lock Scala version in Spark profiles. #2014
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -778,7 +778,31 @@ | |
| <sparkVersion>3.0.3</sparkVersion> | ||
| <shortSparkVersion>3.0</shortSparkVersion> | ||
| <nettyVersion>4.1.47.Final</nettyVersion> | ||
| <scalaVersion>2.12</scalaVersion> | ||
| <scalaLongVersion>2.12.18</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| <compilerPlugin> | ||
| <groupId>org.scalamacros</groupId> | ||
| <artifactId>paradise_${scalaLongVersion}</artifactId> | ||
| <version>${scalamacros.paradise.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
|
|
@@ -789,7 +813,31 @@ | |
| <sparkVersion>3.1.3</sparkVersion> | ||
| <shortSparkVersion>3.1</shortSparkVersion> | ||
| <nettyVersion>4.1.51.Final</nettyVersion> | ||
| <scalaVersion>2.12</scalaVersion> | ||
| <scalaLongVersion>2.12.18</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| <compilerPlugin> | ||
| <groupId>org.scalamacros</groupId> | ||
| <artifactId>paradise_${scalaLongVersion}</artifactId> | ||
| <version>${scalamacros.paradise.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
|
|
@@ -800,7 +848,31 @@ | |
| <sparkVersion>3.2.4</sparkVersion> | ||
| <shortSparkVersion>3.2</shortSparkVersion> | ||
| <nettyVersion>4.1.68.Final</nettyVersion> | ||
| <scalaVersion>2.12</scalaVersion> | ||
| <scalaLongVersion>2.12.18</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| <compilerPlugin> | ||
| <groupId>org.scalamacros</groupId> | ||
| <artifactId>paradise_${scalaLongVersion}</artifactId> | ||
| <version>${scalamacros.paradise.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
|
|
@@ -811,7 +883,31 @@ | |
| <sparkVersion>3.3.4</sparkVersion> | ||
| <shortSparkVersion>3.3</shortSparkVersion> | ||
| <nettyVersion>4.1.74.Final</nettyVersion> | ||
| <scalaVersion>2.12</scalaVersion> | ||
| <scalaLongVersion>2.12.18</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| <compilerPlugin> | ||
| <groupId>org.scalamacros</groupId> | ||
| <artifactId>paradise_${scalaLongVersion}</artifactId> | ||
| <version>${scalamacros.paradise.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
|
|
@@ -822,7 +918,31 @@ | |
| <sparkVersion>3.4.4</sparkVersion> | ||
| <shortSparkVersion>3.4</shortSparkVersion> | ||
| <nettyVersion>4.1.87.Final</nettyVersion> | ||
| <scalaVersion>2.12</scalaVersion> | ||
| <scalaLongVersion>2.12.18</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| <compilerPlugin> | ||
| <groupId>org.scalamacros</groupId> | ||
| <artifactId>paradise_${scalaLongVersion}</artifactId> | ||
| <version>${scalamacros.paradise.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
|
|
@@ -833,7 +953,31 @@ | |
| <sparkVersion>3.5.8</sparkVersion> | ||
| <shortSparkVersion>3.5</shortSparkVersion> | ||
| <nettyVersion>4.1.96.Final</nettyVersion> | ||
| <scalaVersion>2.12</scalaVersion> | ||
| <scalaLongVersion>2.12.18</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| <compilerPlugin> | ||
| <groupId>org.scalamacros</groupId> | ||
| <artifactId>paradise_${scalaLongVersion}</artifactId> | ||
| <version>${scalamacros.paradise.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
|
|
@@ -844,6 +988,8 @@ | |
| <sparkVersion>4.0.2</sparkVersion> | ||
| <shortSparkVersion>4.0</shortSparkVersion> | ||
| <nettyVersion>4.1.111.Final</nettyVersion> | ||
| <scalaVersion>2.13</scalaVersion> | ||
| <scalaLongVersion>2.13.17</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
|
|
@@ -874,6 +1020,33 @@ | |
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <args combine.self="override"> | ||
| <arg>-Ymacro-annotations</arg> | ||
| <arg>-Wconf:cat=deprecation:wv,any:e</arg> | ||
| <arg>-Wconf:cat=other-nullary-override:s</arg> | ||
| <arg>-Wconf:msg=^(?=.*?method|value|type|object|trait|inheritance)(?=.*?deprecated)(?=.*?since 2.13).+$:s</arg> | ||
| <arg>-Wconf:msg=Auto-application to \`\(\)\` is deprecated:s</arg> | ||
| <arg>-Wconf:msg=object JavaConverters in package collection is deprecated:s</arg> | ||
| <arg>-Wconf:cat=unchecked&msg=outer reference:s</arg> | ||
| <arg>-Wconf:cat=unchecked&msg=eliminated by erasure:s</arg> | ||
| <arg>-Wconf:cat=unused-nowarn:s</arg> | ||
| <arg>-Wconf:msg=early initializers are deprecated:s</arg> | ||
| <arg>-Wconf:cat=other-match-analysis:s</arg> | ||
| <arg>-Wconf:cat=feature-existentials:s</arg> | ||
| </args> | ||
|
Comment on lines
+1027
to
+1040
|
||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
@@ -886,6 +1059,8 @@ | |
| <sparkVersion>4.1.1</sparkVersion> | ||
| <shortSparkVersion>4.1</shortSparkVersion> | ||
| <nettyVersion>4.1.118.Final</nettyVersion> | ||
| <scalaVersion>2.13</scalaVersion> | ||
| <scalaLongVersion>2.13.17</scalaLongVersion> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
|
|
@@ -916,6 +1091,33 @@ | |
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <args combine.self="override"> | ||
| <arg>-Ymacro-annotations</arg> | ||
| <arg>-Wconf:cat=deprecation:wv,any:e</arg> | ||
| <arg>-Wconf:cat=other-nullary-override:s</arg> | ||
| <arg>-Wconf:msg=^(?=.*?method|value|type|object|trait|inheritance)(?=.*?deprecated)(?=.*?since 2.13).+$:s</arg> | ||
| <arg>-Wconf:msg=Auto-application to \`\(\)\` is deprecated:s</arg> | ||
| <arg>-Wconf:msg=object JavaConverters in package collection is deprecated:s</arg> | ||
| <arg>-Wconf:cat=unchecked&msg=outer reference:s</arg> | ||
| <arg>-Wconf:cat=unchecked&msg=eliminated by erasure:s</arg> | ||
| <arg>-Wconf:cat=unused-nowarn:s</arg> | ||
| <arg>-Wconf:msg=early initializers are deprecated:s</arg> | ||
| <arg>-Wconf:cat=other-match-analysis:s</arg> | ||
| <arg>-Wconf:cat=feature-existentials:s</arg> | ||
| </args> | ||
|
Comment on lines
+1098
to
+1111
|
||
| <compilerPlugins combine.self="override"> | ||
| <compilerPlugin> | ||
| <groupId>org.scalameta</groupId> | ||
| <artifactId>semanticdb-scalac_${scalaLongVersion}</artifactId> | ||
| <version>${semanticdb.version}</version> | ||
| </compilerPlugin> | ||
| </compilerPlugins> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The scala-2.12 profile (lines 1177-1207) will automatically activate when scalaVersion=2.12 due to its activation condition. Since all Spark 3.x profiles now set this property, both the Spark profile and the scala-2.12 profile will be active simultaneously.
While the use of
combine.self="override"in the Spark profiles should prevent configuration merging, this creates a potential maintenance issue and could lead to unexpected behavior if the override attribute is removed or if Maven's profile merging behavior changes. Consider either: