diff --git a/Jenkinsfile b/Jenkinsfile
index 4b1e8581ecc..2e4310ad6ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
 					# via configuration/argLine property in pom.xml
 					# export MAVEN_OPTS="-Xmx2G"
 					
-					mvn clean install -f org.eclipse.jdt.core.compiler.batch -DlocalEcjVersion=99.99 -Dmaven.repo.local=$WORKSPACE/.m2/repository
+					mvn clean install -f org.eclipse.jdt.core.compiler.batch -DlocalEcjVersion=99.99 -Dmaven.repo.local=$WORKSPACE/.m2/repository -DcompilerBaselineMode=disable -DcompilerBaselineReplace=none
 					
 					mvn -U clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
 					-Ptest-on-javase-21 -Pbree-libs -Papi-check \
diff --git a/org.eclipse.jdt.core.compiler.batch/pom.xml b/org.eclipse.jdt.core.compiler.batch/pom.xml
index 3d858e68a01..3b443d3850d 100644
--- a/org.eclipse.jdt.core.compiler.batch/pom.xml
+++ b/org.eclipse.jdt.core.compiler.batch/pom.xml
@@ -21,6 +21,8 @@
   <packaging>eclipse-plugin</packaging>
 
   <properties>
+    <compilerBaselineReplace>common</compilerBaselineReplace>
+    <compilerBaselineMode>warn</compilerBaselineMode>
     <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
     <code.ignoredWarnings>-warn:+fieldHiding,-unavoidableGenericProblems</code.ignoredWarnings>
     <localEcjVersion>${project.version}</localEcjVersion>
@@ -76,8 +78,8 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-p2-plugin</artifactId>
         <configuration>
-          <baselineMode>warn</baselineMode>
-          <baselineReplace>common</baselineReplace>
+          <baselineMode>${compilerBaselineMode}</baselineMode>
+          <baselineReplace>${compilerBaselineReplace}</baselineReplace>
         </configuration>
         <executions>
           <execution>