Skip to content

Commit b9e0bf2

Browse files
committed
Bump Java bytecode compatibility version to Java11
1 parent a615657 commit b9e0bf2

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
## Deprecations
8383

8484
* X behavior is deprecated and will be removed in X versions ([#X](https://github.com/apache/beam/issues/X)).
85+
* Dropped Java 8 support ([#31678](https://github.com/apache/beam/issues/31678)).
8586

8687
## Bugfixes
8788

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,6 +1132,8 @@ class BeamModulePlugin implements Plugin<Project> {
11321132
project.javaVersion = '17'
11331133
} else if (JavaVersion.VERSION_21.equals(configuration.requireJavaVersion)) {
11341134
project.javaVersion = '21'
1135+
} else if (JavaVersion.VERSION_25.equals(configuration.requireJavaVersion)) {
1136+
project.javaVersion = '25'
11351137
} else {
11361138
throw new GradleException(
11371139
"requireJavaVersion has to be supported LTS version greater than the default Java version. Actual: " +
@@ -1154,6 +1156,9 @@ class BeamModulePlugin implements Plugin<Project> {
11541156
} else if (requireJavaVersion.compareTo(JavaVersion.VERSION_21) <= 0 &&
11551157
project.hasProperty('java21Home')) {
11561158
forkJavaVersion = '21'
1159+
} else if (requireJavaVersion.compareTo(JavaVersion.VERSION_25) <= 0 &&
1160+
project.hasProperty('java25Home')) {
1161+
forkJavaVersion = '25'
11571162
} else {
11581163
logger.config("Module ${project.name} disabled. To enable, either " +
11591164
"compile on newer Java version or pass java${project.javaVersion}Home project property")
@@ -1582,7 +1587,7 @@ class BeamModulePlugin implements Plugin<Project> {
15821587
options.encoding = "UTF-8"
15831588
// If compiled on newer JDK, set byte code compatibility
15841589
if (requireJavaVersion.compareTo(JavaVersion.current()) < 0) {
1585-
def compatVersion = project.javaVersion == '1.8' ? '8' : project.javaVersion
1590+
def compatVersion = project.javaVersion == '11' ? '11' : project.javaVersion
15861591
options.compilerArgs += ['--release', compatVersion]
15871592
// TODO(https://github.com/apache/beam/issues/23901): Fix
15881593
// optimizerOuterThis breakage
@@ -1616,7 +1621,7 @@ class BeamModulePlugin implements Plugin<Project> {
16161621
}
16171622

16181623
// if specified test java version, modify the compile and runtime versions accordingly
1619-
if (['8', '11', '17', '21', '25'].contains(project.findProperty('testJavaVersion'))) {
1624+
if (['11', '17', '21', '25'].contains(project.findProperty('testJavaVersion'))) {
16201625
String ver = project.getProperty('testJavaVersion')
16211626
def testJavaHome = project.getProperty("java${ver}Home")
16221627

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ signing.gnupg.useLegacyGpg=true
3333
version=2.74.0-SNAPSHOT
3434
sdk_version=2.74.0.dev
3535

36-
javaVersion=1.8
36+
javaVersion=11
3737

3838
docker_image_default_repo_root=apache
3939
docker_image_default_repo_prefix=beam_

website/www/site/content/en/documentation/sdks/java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ Apache Beam lets you combine transforms written in any supported SDK language an
7878
</tr>
7979
<tr>
8080
<td>8</td>
81-
<td>2.x</td>
81+
<td>&le; 2.73.0</td>
8282
</tr>
8383
</table>

0 commit comments

Comments
 (0)