Replace org.freemarker with org.freemarker.freemarker

Also remove re-exports & add package imports

Fixes #546

NewAndNoteworthy/CHANGELOG-API.md

@@ -7,6 +7,15 @@ This section describes API removals that occurred in past releases, and upcoming
 # API Changes
 
 Below is the detailed descriptions of API changes and mitigation efforts API consumers need to take.
+## API Changes in CDT 11.4.
+
+### org.eclipse.tools.templates.freemarker no longer re-exports org.freemarker
+
+The bundle of Freemarker has changed from org.freemarker to org.freemarker.freemarker. As part of
+this the re-exports of freemarker have been removed from org.eclipse.tools.templates.freemarker. 
+
+Consumers of org.eclipse.tools.templates.freemarker now need to add dependencies on freemarker to
+their own plugins. Must likely this will at least be a package import for "freemarker.template"
 
 ## API Changes in CDT 11.0.
 

build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.cdt.autotools.core;singleton:=true
-Bundle-Version: 2.2.100.qualifier
+Bundle-Version: 2.2.200.qualifier
 Bundle-Activator: org.eclipse.cdt.autotools.core.AutotoolsPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",

build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true
-Bundle-Version: 7.6.300.qualifier
+Bundle-Version: 7.6.400.qualifier
 Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -19,13 +19,14 @@ Export-Package: org.eclipse.cdt.make.core,
  org.eclipse.cdt.make.internal.core.scannerconfig.jobs;x-internal:=true,
  org.eclipse.cdt.make.internal.core.scannerconfig.util;x-internal:=true,
  org.eclipse.cdt.make.internal.core.scannerconfig2;x-internal:=true
+Import-Package: freemarker.template;version="[2.3.22,3.0.0)"
 Require-Bundle: org.eclipse.cdt.core;bundle-version="[8.3.0,9.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="1.2.0",
  org.eclipse.tools.templates.core;bundle-version="1.1.0",
- org.eclipse.tools.templates.freemarker;bundle-version="1.0.0"
+ org.eclipse.tools.templates.freemarker;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.cdt.make.core

build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF

@@ -2,17 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.cdt.meson.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.cdt.meson.core.Activator
 Bundle-Vendor: %provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.cdt.core;bundle-version="6.4.0",
- org.eclipse.tools.templates.freemarker;bundle-version="1.2.200"
+ org.eclipse.tools.templates.core;bundle-version="1.3.0",
+ org.eclipse.tools.templates.freemarker;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Import-Package: com.google.gson
+Import-Package: com.google.gson,
+ freemarker.template;version="[2.3.22,3.0.0)"
 Export-Package: org.eclipse.cdt.internal.meson.core;x-friends:="org.eclipse.cdt.meson.ui",
  org.eclipse.cdt.meson.core
 Service-Component: OSGI-INF/component.xml

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

@@ -2,14 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.cmake.core;singleton:=true
-Bundle-Version: 1.5.300.qualifier
+Bundle-Version: 1.5.400.qualifier
 Bundle-Activator: org.eclipse.cdt.cmake.core.internal.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.11.0",
  org.eclipse.debug.core;bundle-version="3.10.0",
  org.eclipse.launchbar.core;bundle-version="2.0.0",
  org.eclipse.cdt.core;bundle-version="5.12.0",
+ org.eclipse.tools.templates.core;bundle-version="1.3.0",
  org.eclipse.tools.templates.freemarker;bundle-version="1.2.200",
  com.google.gson,
  org.eclipse.cdt.jsoncdb.core
@@ -20,7 +21,8 @@ Export-Package: org.eclipse.cdt.cmake.core,
  org.eclipse.cdt.cmake.core.properties
 Automatic-Module-Name: org.eclipse.cdt.cmake.core
 Bundle-Localization: plugin
-Import-Package: org.eclipse.core.variables,
+Import-Package: freemarker.template;version="[2.3.22,3.0.0)",
+ org.eclipse.core.variables,
  org.yaml.snakeyaml;version="[2.0.0,3.0.0)",
  org.yaml.snakeyaml.constructor;version="[2.0.0,3.0.0)",
  org.yaml.snakeyaml.inspector;version="[2.0.0,3.0.0)",

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

@@ -406,7 +406,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.ui.workbench"/>
       <plugin id="org.eclipse.ui.workbench.texteditor"/>
       <plugin id="org.eclipse.urischeme"/>
-      <plugin id="org.freemarker"/>
+      <plugin id="org.freemarker.freemarker"/>
       <plugin id="org.jdom"/>
       <plugin id="org.objectweb.asm"/>
       <plugin id="org.objectweb.asm.commons"/>

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

@@ -186,7 +186,7 @@
    <bundle id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
    <bundle id="com.sun.xml.bind" version="0.0.0"/>
    <bundle id="com.google.gson" version="0.0.0"/>
-   <bundle id="org.freemarker" version="0.0.0"/>
+   <bundle id="org.freemarker.freemarker" version="2.3.32.stable"/>
    <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"/>

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

@@ -96,7 +96,7 @@
 				<dependency>
 					<groupId>org.freemarker</groupId>
 					<artifactId>freemarker</artifactId>
-					<version>2.3.32</version>
+					<version>2.3.32</version> <!-- Also update in releng/org.eclipse.cdt.repo/category.xml-->
 					<type>jar</type>
 				</dependency>
 				<dependency>

tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF

@@ -2,17 +2,18 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.tools.templates.freemarker
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.tools.templates.freemarker
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.freemarker;visibility:=reexport,
- org.eclipse.tools.templates.core;bundle-version="1.1.2";visibility:=reexport,
+ org.eclipse.tools.templates.core;bundle-version="1.1.2",
  com.sun.xml.bind;bundle-version="[2.3.3,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.tools.templates.freemarker
 Bundle-Localization: plugin
-Import-Package: javax.xml.bind;version="[2.3.3,3.0.0)",
+Import-Package: freemarker.cache;version="[2.3.22,3.0.0)",
+ freemarker.template;version="[2.3.22,3.0.0)",
+ javax.xml.bind;version="[2.3.3,3.0.0)",
  javax.xml.bind.annotation;version="[2.3.3,3.0.0)"