mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-03-28 14:56:28 +01:00
Replace org.freemarker with org.freemarker.freemarker (#547)
Also remove re-exports & add package imports Fixes #546
This commit is contained in:
William Riley
GitHub
parent
a498b56c59
commit
5250f5a07b
17 changed files with 66 additions and 31 deletions
|
|
@ -9,6 +9,9 @@ This is the New & Noteworthy page for CDT 11.4 which is part of Eclipse 2023-12
|
|||
|
||||
# API Changes, current and planned
|
||||
|
||||
## Changes to org.eclipse.tools.templates APIs
|
||||
|
||||
Re-exports from org.eclipse.tools.templates.freemarker & org.eclipse.tools.templates.ui have been removed. Please see for full details [CHANGELOG-API](CHANGELOG-API.md)
|
||||
|
||||
## Breaking API changes
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,25 @@ This section describes API removals that occurred in past releases, and upcoming
|
|||
|
||||
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, org.eclipse.tools.templates.freemarker.ui and org.eclipse.tools.templates.freemarker.core major version bumped
|
||||
|
||||
The major version numbers of the org.eclipse.tools.templates set of bundles has been bumped to 2.0.0 because of the changes outlined below.
|
||||
|
||||
### 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"
|
||||
|
||||
### org.eclipse.tools.templates.ui no longer re-exports org.eclipse.tools.templates.core
|
||||
|
||||
org.eclipse.tools.templates.ui no longer re-exports org.eclipse.tools.templates.core. Consumers
|
||||
may now need to add that dependency to their own plugins
|
||||
|
||||
## API Changes in CDT 11.0.
|
||||
|
||||
### org.eclipse.cdt.ui.newui.AbstractPage reduced visibility of many fields
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.core.autotools.core;singleton:=true
|
||||
Bundle-Version: 1.3.0.qualifier
|
||||
Bundle-Version: 1.3.100.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.core.autotools.core.internal.Activator
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="1.0.0",
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="2.0.0",
|
||||
org.eclipse.cdt.core;bundle-version="6.3.1",
|
||||
org.eclipse.core.resources;bundle-version="3.12.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
|
|
@ -13,5 +14,6 @@ Bundle-ActivationPolicy: lazy
|
|||
Bundle-Vendor: %providerName
|
||||
Export-Package: org.eclipse.cdt.core.autotools.core;x-friends:="org.eclipse.cdt.core.autotools.ui",
|
||||
org.eclipse.cdt.core.autotools.core.internal;x-friends:="org.eclipse.cdt.core.autotools.ui"
|
||||
Import-Package: freemarker.template;version="[2.3.22,3.0.0)"
|
||||
Bundle-Localization: plugin
|
||||
Automatic-Module-Name: org.eclipse.cdt.core.autotools.core
|
||||
|
|
|
|||
|
|
@ -2,15 +2,16 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.core.autotools.ui;singleton:=true
|
||||
Bundle-Version: 1.2.100.qualifier
|
||||
Bundle-Version: 1.2.200.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.core.autotools.ui.internal.Activator
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.ui,
|
||||
org.eclipse.core.runtime,
|
||||
org.eclipse.tools.templates.ui;bundle-version="1.1.1",
|
||||
org.eclipse.ui.ide;bundle-version="3.13.0",
|
||||
org.eclipse.cdt.core.autotools.core;bundle-version="1.0.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="1.0.0"
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.ui;bundle-version="2.0.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Bundle-ActivationPolicy: lazy
|
||||
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.core;bundle-version="2.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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true
|
||||
Bundle-Version: 8.2.0.qualifier
|
||||
Bundle-Version: 8.2.100.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.make.internal.ui.MakeUIPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
|
@ -36,8 +36,9 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
|
|||
org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
|
||||
org.eclipse.compare;bundle-version="[3.3.0,4.0.0)",
|
||||
org.eclipse.core.filesystem;bundle-version="1.2.0",
|
||||
org.eclipse.tools.templates.ui;bundle-version="1.1.1",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="1.0.0",
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.ui;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="2.0.0",
|
||||
org.eclipse.cdt.launch;bundle-version="9.2.0"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
|
|
|
|||
|
|
@ -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="2.0.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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name.0
|
||||
Bundle-SymbolicName: org.eclipse.cdt.meson.ui;singleton:=true
|
||||
Bundle-Version: 1.2.100.qualifier
|
||||
Bundle-Version: 1.2.200.qualifier
|
||||
Bundle-Vendor: %vendorName
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Bundle-Activator: org.eclipse.cdt.meson.ui.Activator
|
||||
|
|
@ -11,8 +11,9 @@ Bundle-Localization: plugin
|
|||
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0",
|
||||
org.eclipse.ui;bundle-version="3.109.0",
|
||||
org.eclipse.cdt.meson.core;bundle-version="1.0.0",
|
||||
org.eclipse.tools.templates.ui;bundle-version="1.3.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="1.2.200",
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.ui;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="2.0.0",
|
||||
org.eclipse.ui.ide;bundle-version="3.13.1",
|
||||
org.eclipse.cdt.core;bundle-version="6.4.0",
|
||||
org.eclipse.core.resources;bundle-version="3.12.0",
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
|
|||
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.freemarker;bundle-version="1.2.200",
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="2.0.0",
|
||||
com.google.gson,
|
||||
org.eclipse.cdt.jsoncdb.core
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
|
|
@ -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)",
|
||||
|
|
|
|||
|
|
@ -10,8 +10,9 @@ Require-Bundle: org.eclipse.core.runtime,
|
|||
org.eclipse.ui,
|
||||
org.eclipse.ui.ide,
|
||||
org.eclipse.cdt.cmake.core,
|
||||
org.eclipse.tools.templates.ui;bundle-version="1.3.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="1.2.200",
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.ui;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.freemarker;bundle-version="2.0.0",
|
||||
org.eclipse.cdt.core;bundle-version="6.1.0",
|
||||
org.eclipse.debug.ui;bundle-version="3.11.200",
|
||||
org.eclipse.cdt.launch;bundle-version="9.1.0",
|
||||
|
|
|
|||
|
|
@ -127,7 +127,8 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[8.3.0,9.0.0)",
|
|||
org.eclipse.ui.views;bundle-version="[3.11.300,4.0.0)",
|
||||
org.eclipse.ui.workbench.texteditor;bundle-version="[3.16.600,4.0.0)",
|
||||
org.eclipse.e4.ui.css.swt.theme,
|
||||
org.eclipse.tools.templates.ui;bundle-version="[1.4.0,2.0.0)"
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0",
|
||||
org.eclipse.tools.templates.ui;bundle-version="2.0.0"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Automatic-Module-Name: org.eclipse.cdt.ui
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.tools.templates.core
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tools.templates.core
|
||||
Bundle-Version: 1.3.0.qualifier
|
||||
Bundle-Version: 2.0.0.qualifier
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.core.resources
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
|
|
|
|||
|
|
@ -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="2.0.0",
|
||||
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)"
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ Automatic-Module-Name: org.eclipse.tools.templates.ui
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tools.templates.ui;singleton:=true
|
||||
Bundle-Version: 1.4.0.qualifier
|
||||
Bundle-Version: 2.0.0.qualifier
|
||||
Bundle-Activator: org.eclipse.tools.templates.ui.internal.Activator
|
||||
Require-Bundle: org.eclipse.ui,
|
||||
org.eclipse.core.runtime,
|
||||
org.eclipse.ui.ide,
|
||||
org.eclipse.core.resources,
|
||||
org.eclipse.tools.templates.core;bundle-version="1.0.0";visibility:=reexport
|
||||
org.eclipse.tools.templates.core;bundle-version="2.0.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Export-Package: org.eclipse.tools.templates.ui,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue