Skip to content

Commit

Permalink
[FLINK-36181] Bump Scala to 2.12.19
Browse files Browse the repository at this point in the history
This is a breaking change for Flink 2.0, and allows us to next remove the specific Scala versions for both Java 17 and 21
  • Loading branch information
MartijnVisser committed Sep 2, 2024
1 parent cdcc943 commit effa78d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
6 changes: 3 additions & 3 deletions flink-dist-scala/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This project bundles the following dependencies under the Apache Software Licens

The following dependencies all share the same BSD license which you find under licenses/LICENSE.scala.

- org.scala-lang:scala-compiler:2.12.7
- org.scala-lang:scala-library:2.12.7
- org.scala-lang:scala-reflect:2.12.7
- org.scala-lang:scala-compiler:2.12.19
- org.scala-lang:scala-library:2.12.19
- org.scala-lang:scala-reflect:2.12.19
- org.scala-lang.modules:scala-xml_2.12:1.0.6
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ The Apache Software Foundation (http://www.apache.org/).

The following dependencies all share the same BSD license which you find under licenses/LICENSE.scala.

- org.scala-lang:scala-compiler:2.12.7
- org.scala-lang:scala-library:2.12.7
- org.scala-lang:scala-reflect:2.12.7
- org.scala-lang:scala-compiler:2.12.19
- org.scala-lang:scala-library:2.12.19
- org.scala-lang:scala-reflect:2.12.19
12 changes: 5 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,7 @@ under the License.
<maven.compiler.source>${target.java.version}</maven.compiler.source>
<maven.compiler.target>${target.java.version}</maven.compiler.target>
<scala.macros.version>2.1.1</scala.macros.version>
<!-- Default scala versions, must be overwritten by build profiles, so we set something
invalid here -->
<scala.version>2.12.7</scala.version>
<scala.version>2.12.19</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<chill.version>0.7.6</chill.version>
<!-- keep FlinkTestcontainersConfigurator.configureZookeeperContainer in sync -->
Expand Down Expand Up @@ -973,7 +971,7 @@ under the License.
<profile>
<id>scala-2.12</id>
<properties>
<scala.version>2.12.7</scala.version>
<scala.version>2.12.19</scala.version>
<scala.binary.version>2.12</scala.binary.version>
</properties>
<activation>
Expand Down Expand Up @@ -1133,7 +1131,7 @@ under the License.

<properties>
<!-- Bump Scala because 2.12.7 doesn't compile on Java 17. -->
<scala.version>2.12.15</scala.version>
<scala.version>2.12.19</scala.version>
<surefire.excludedGroups.jdk>org.apache.flink.testutils.junit.FailsOnJava17</surefire.excludedGroups.jdk>
</properties>

Expand Down Expand Up @@ -1190,8 +1188,8 @@ under the License.
</activation>

<properties>
<!-- Bump Scala because before 2.12.18 doesn't compile on Java 21. -->
<scala.version>2.12.18</scala.version>
<!-- Bump Scala because before 2.12.7 doesn't compile on Java 21. -->
<scala.version>2.12.19</scala.version>
</properties>

<build>
Expand Down

0 comments on commit effa78d

Please sign in to comment.