Merge branch 'eclipse-cdt:main' into main

debug/org.eclipse.cdt.debug.application.product/debug.product

@@ -203,7 +203,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.apache.commons.codec"/>
       <plugin id="org.apache.commons.collections"/>
       <plugin id="org.apache.commons.commons-beanutils"/>
-      <plugin id="org.apache.commons.io"/>
+      <plugin id="org.apache.commons.commons-io"/>
       <plugin id="org.apache.commons.jxpath"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.scr"/>

jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF

@@ -18,10 +18,10 @@ Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.8.0",
  org.eclipse.core.resources;bundle-version="3.13.700",
  org.eclipse.core.runtime;bundle-version="3.17.100",
  org.eclipse.cdt.core,
- org.eclipse.jface,
- com.google.gson,
- org.apache.commons.io;bundle-version="2.6.0"
+ org.eclipse.jface
 Automatic-Module-Name: org.eclipse.cdt.jsoncdb.core
-Import-Package: org.eclipse.e4.core.contexts;version="1.7.0",
+Import-Package: com.google.gson;version="[2.10.1,3.0.0)",
+ org.apache.commons.io;version="[2.13.0,3.0.0)",
+ org.eclipse.e4.core.contexts;version="1.7.0",
  org.osgi.service.component.annotations;version="1.2.0"
 Service-Component: OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml

releng/org.eclipse.cdt.repo/category.xml

@@ -190,7 +190,7 @@
    <bundle id="org.yaml.snakeyaml" version="0.0.0"/>
    <bundle id="com.sun.jna" version="0.0.0"/>
    <bundle id="com.sun.jna.platform" version="0.0.0"/>
-   <bundle id="org.apache.commons.io" version="0.0.0"/>
+   <bundle id="org.apache.commons.commons-io" version="0.0.0"/>
    <bundle id="org.eclipse.tools.templates.core" version="0.0.0"/>
    <bundle id="org.eclipse.tools.templates.core.source" version="0.0.0"/>
    <bundle id="org.eclipse.tools.templates.freemarker" version="0.0.0"/>

releng/org.eclipse.cdt.target/cdt.target

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="144">
+<target name="cdt" sequenceNumber="145">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/cbi/updates/license/" />
 			<unit id="org.eclipse.license.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/eclipse/updates/4.29-I-builds/I20230815-0600/" />
+			<repository location="https://download.eclipse.org/eclipse/updates/4.29-I-builds/I20230817-0230/" />
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
 			<unit id="org.eclipse.jdt.annotation" version="0.0.0" />
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0" />
@@ -42,8 +42,8 @@
 			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/cdt/releases/latest" />
 			<!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
+			<repository location="https://download.eclipse.org/tools/cdt/builds/11.3/cdt-11.3.0-m2a/" />
 			<unit id="org.eclipse.cdt.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -206,4 +206,4 @@
 		-ea</vmArgs>
 		<programArgs>-consolelog</programArgs>
 	</launcherArgs>
-</target>
+</target>