diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product index dfe61143ae5..12fe9c99fb1 100644 --- a/debug/org.eclipse.cdt.debug.application.product/debug.product +++ b/debug/org.eclipse.cdt.debug.application.product/debug.product @@ -185,34 +185,29 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + + - - - - + + + - - - - - - @@ -252,6 +247,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + @@ -301,7 +297,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + @@ -358,26 +354,33 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + + + - + + - + + + + @@ -386,6 +389,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + @@ -408,6 +412,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + @@ -430,23 +435,20 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - - - - - + + + diff --git a/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF index 463018d5074..8bde0fc5599 100644 --- a/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF @@ -20,7 +20,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.1", org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="8.2.0", org.eclipse.cdt.debug.core, - org.eclipse.ui.workbench + org.eclipse.ui.workbench, + org.eclipse.orbit.xml-apis-ext, + jakarta.activation-api, + jakarta.xml.bind-api Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/pom.xml b/pom.xml index e8226e3a600..e36239df2d3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 1.3.4 jacoco http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository - https://download.eclipse.org/staging/2023-09/ + https://download.eclipse.org/staging/2023-12/ tools/cdt/builds/master/nightly reuseReports ${project.basedir}/../../target/jacoco.exec diff --git a/releng/CDT.setup b/releng/CDT.setup index b554888adda..740f2897faf 100644 --- a/releng/CDT.setup +++ b/releng/CDT.setup @@ -74,7 +74,7 @@ - + - + @@ -57,10 +57,10 @@ 2.0.7 jar - + org.slf4j - slf4j-nop + slf4j-simple 2.0.7 jar @@ -195,7 +195,7 @@ - + @@ -203,6 +203,7 @@ +