From 18ae9bb4b688e68f92078b8197f1768f7e7ab344 Mon Sep 17 00:00:00 2001 From: William Riley Date: Wed, 13 Sep 2023 11:52:07 +0100 Subject: [PATCH] Replace org.freemarker with org.freemarker.freemarker Also remove re-exports & add package imports Fixes #546 --- NewAndNoteworthy/CHANGELOG-API.md | 9 +++++++++ .../org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 ++++-- build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF | 5 +++-- build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF | 8 +++++--- cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF | 6 ++++-- .../debug.product | 2 +- releng/org.eclipse.cdt.repo/category.xml | 2 +- releng/org.eclipse.cdt.target/cdt.target | 2 +- .../META-INF/MANIFEST.MF | 9 +++++---- 10 files changed, 34 insertions(+), 17 deletions(-) diff --git a/NewAndNoteworthy/CHANGELOG-API.md b/NewAndNoteworthy/CHANGELOG-API.md index 63a743cdd3c..5e5b731d51d 100644 --- a/NewAndNoteworthy/CHANGELOG-API.md +++ b/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. diff --git a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF index 0d6ccda43f5..dd6a3f6eb4a 100644 --- a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF +++ b/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", diff --git a/build/org.eclipse.cdt.core.autotools.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.core.autotools.core/META-INF/MANIFEST.MF index 2a5c59b74d9..4dbb3772314 100644 --- a/build/org.eclipse.cdt.core.autotools.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.core.autotools.core/META-INF/MANIFEST.MF @@ -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="1.3.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 diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF index 8a0af3cccd0..c9e7c7165a0 100644 --- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF +++ b/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 diff --git a/build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF index ef6eadff192..b7ea8d8e744 100644 --- a/build/org.eclipse.cdt.meson.core/META-INF/MANIFEST.MF +++ b/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 diff --git a/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF index 2947802d07e..f9540c8c6bb 100644 --- a/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF +++ b/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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, @@ -10,6 +10,7 @@ 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.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)", diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product index 0fa84f1750c..0df0be3ef06 100644 --- a/debug/org.eclipse.cdt.debug.application.product/debug.product +++ b/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 - + diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml index 3143c7e193c..cc764e9183c 100644 --- a/releng/org.eclipse.cdt.repo/category.xml +++ b/releng/org.eclipse.cdt.repo/category.xml @@ -186,7 +186,7 @@ - + diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index eecfd98d4a4..13eb1a6067a 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -96,7 +96,7 @@ org.freemarker freemarker - 2.3.32 + 2.3.32 jar diff --git a/tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF b/tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF index 7c2e2bfd2c3..4960c0d2bca 100644 --- a/tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF +++ b/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)"