OpenLiberty · jhanders34 · Dec 10, 2025 · Dec 1, 2025
diff --git a/dev/com.ibm.ws.appclient.boot.cmdline/bnd.bnd b/dev/com.ibm.ws.appclient.boot.cmdline/bnd.bnd
@@ -1,10 +1,10 @@
 #*******************************************************************************
-# Copyright (c) 2017 IBM Corporation and others.
+# Copyright (c) 2017, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-2.0/
-# 
+#
 # SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
@@ -13,11 +13,6 @@
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 Bundle-SymbolicName: com.ibm.ws.appclient.boot.cmdline
 
 instrument.disabled: true

diff --git a/dev/com.ibm.ws.ejbcontainer.remote.portable.core/bnd.bnd b/dev/com.ibm.ws.ejbcontainer.remote.portable.core/bnd.bnd
@@ -1,10 +1,10 @@
 #*******************************************************************************
-# Copyright (c) 2017 IBM Corporation and others.
+# Copyright (c) 2017, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-2.0/
-# 
+#
 # SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
@@ -13,11 +13,6 @@
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 Export-Package: \
 	com.ibm.ejs.container,\
 	com.ibm.ejs.container.activator,\

diff --git a/dev/com.ibm.ws.ejbcontainer.remote.portable/bnd.bnd b/dev/com.ibm.ws.ejbcontainer.remote.portable/bnd.bnd
@@ -4,7 +4,7 @@
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-2.0/
-# 
+#
 # SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
@@ -16,11 +16,6 @@
 
 bVersion=1.0
 
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 Import-Package: \
     !com.ibm.ws.logging, \
     *
@@ -36,4 +31,4 @@ publish.wlp.jar.suffix: clients
 
 publish.wlp.jar.include: ejbRemotePortable.*jar
 
-publish.wlp.jar.rename: false
+publish.wlp.jar.rename: false
diff --git a/dev/com.ibm.ws.kernel.boot.cmdline/bnd.bnd b/dev/com.ibm.ws.kernel.boot.cmdline/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2017 IBM Corporation and others.
+# Copyright (c) 2017, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -13,11 +13,6 @@
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 Export-Package: com.ibm.ws.kernel.boot.cmdline;-split-package:=merge-last
 
 instrument.disabled: true

diff --git a/dev/com.ibm.ws.kernel.boot.nested/bnd.bnd b/dev/com.ibm.ws.kernel.boot.nested/bnd.bnd
@@ -1,10 +1,10 @@
 #*******************************************************************************
-# Copyright (c) 2017, 2023 IBM Corporation and others.
+# Copyright (c) 2017, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-2.0/
-# 
+#
 # SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
@@ -13,11 +13,6 @@
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 Export-Package: \
 	com.ibm.ws.kernel.launch.service,\
 	com.ibm.ws.kernel,\

diff --git a/dev/com.ibm.ws.kernel.boot/bnd.bnd b/dev/com.ibm.ws.kernel.boot/bnd.bnd
@@ -18,11 +18,6 @@
 -nouses=true
 bVersion=1.0
 
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 # We're going to create a bad bundle here: don't want imports
 # or anything else for the launcher. So just swallow the errors.
 -failok=true

diff --git a/dev/com.ibm.ws.kernel.feature.resolver/bnd.bnd b/dev/com.ibm.ws.kernel.feature.resolver/bnd.bnd
@@ -13,12 +13,6 @@
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
-# Compile at Java 7 in order for this to run in WebSphere Migration Tools and Transformation Advisor.
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 Bundle-Name: Liberty Feature Resolver
 Bundle-SymbolicName: com.ibm.ws.kernel.feature.resolver
 Bundle-Description: Liberty Feature Resolver implementation; version=${bVersion}

diff --git a/dev/com.ibm.ws.kernel.instrument.check/bnd.bnd b/dev/com.ibm.ws.kernel.instrument.check/bnd.bnd
@@ -1,10 +1,10 @@
 #*******************************************************************************
-# Copyright (c) 2017 IBM Corporation and others.
+# Copyright (c) 2017, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-2.0/
-# 
+#
 # SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
@@ -13,11 +13,6 @@
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
-javac.source: 1.7
-javac.target: 1.7
-
-Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))"
-
 Private-Package: com.ibm.ws.kernel.instrument;-split-package:=merge-last
 Can-Redefine-Classes: false
 Can-Retransform-Classes: true

diff --git a/dev/wlp-gradle/java.gradle b/dev/wlp-gradle/java.gradle
@@ -96,13 +96,6 @@ subprojects {
 
   tasks.withType(JavaCompile).configureEach({
       int javaVersionNumVal = Integer.parseInt(JavaVersion.current().getMajorVersion())
-      // javac 20 has a min target of 1.8, so upgrade any 1.7 projects to 1.8 if running on Java 20
-
-      if ('1.7'.equals(sourceCompatibility) && javaVersionNumVal >= 20) {
-          sourceCompatibility = "1.8"
-          targetCompatibility = "1.8"
-      }
-
       if (javaVersionNumVal < 21 && '21'.equals(sourceCompatibility)) {
           javaCompiler = javaToolchains.compilerFor {
               languageVersion = JavaLanguageVersion.of(21)

diff --git a/dev/wlp-gradle/subprojects/tasks.gradle b/dev/wlp-gradle/subprojects/tasks.gradle
@@ -260,9 +260,6 @@ if (bnd.get('publish.wlp.jar.suffix', 'lib').contains('api/ibm') || bnd.get('pub
 
     int javaVersionNumVal = Integer.parseInt(JavaVersion.current().getMajorVersion())
     def release = bnd.get('javac.source')
-    if ('1.7'.equals(release) && javaVersionNumVal >= 20) {
-      release = "8"
-    }
 
     if(release.startsWith('1.')) {
       release = release.substring(2);