Use Import-Package to reference third-party dependencies in templates

And remove unnecessary dependencies. Also remove them as explicitly content from template-products (they are included implicitly if necessary). Fixes #1224
eclipse-passage · May 9, 2023 · d5faafa · d5faafa
1 parent b416453
commit d5faafa
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 19 deletions.
diff --git a/...tes/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedProductSection.java b/...tes/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedProductSection.java
@@ -174,7 +174,6 @@ protected List<String> getRCP3xDependencies() {
 
 	protected List<String> getRCP4xDependencies() {
 		return Arrays.asList(//
-				"javax.inject", //$NON-NLS-1$
 				"org.eclipse.core.runtime", //$NON-NLS-1$
 				"org.eclipse.swt", //$NON-NLS-1$
 				"org.eclipse.jface", //$NON-NLS-1$
@@ -186,8 +185,7 @@ protected List<String> getRCP4xDependencies() {
 				"org.eclipse.e4.core.contexts", //$NON-NLS-1$
 				"org.eclipse.passage.lic.equinox", //$NON-NLS-1$
 				"org.eclipse.passage.lic.e4.ui", //$NON-NLS-1$
-				"org.eclipse.passage.seal.demo", //$NON-NLS-1$
-				"org.apache.logging.log4j"); //$NON-NLS-1$
+				"org.eclipse.passage.seal.demo"); //$NON-NLS-1$
 	}
 
 	protected Requirement createProductRequirement(String product) {

diff --git a/.../org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductContentWizard.java b/.../org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductContentWizard.java
@@ -24,4 +24,9 @@ public ITemplateSection[] createTemplateSections() {
 				new LicensedE4ProductTemplateSection(), //
 		};
 	}
+
+	@Override
+	public String[] getImportPackages() {
+		return new String[] { "javax.inject;version=\"[1.0.0,2.0.0)\"" }; //$NON-NLS-1$
+	}
 }
diff --git a/.../ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductContentWizard.java b/.../ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductContentWizard.java
@@ -23,4 +23,9 @@ public ITemplateSection[] createTemplateSections() {
 				new LicensedE4FullFeatherProductTemplateSection(), //
 		};
 	}
+
+	@Override
+	public String[] getImportPackages() {
+		return new String[] { "javax.annotation;version=\"[1.3.0,2.0.0)\"" }; //$NON-NLS-1$
+	}
 }
diff --git a/...dc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java b/...dc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java
@@ -137,7 +137,6 @@ private IPluginElement product(IPluginExtension extension) throws CoreException
 	@Override
 	protected List<String> getRCP4xDependencies() {
 		List<String> result = new ArrayList<>();
-		result.add("javax.annotation"); //$NON-NLS-1$
 		result.addAll(super.getRCP4xDependencies());
 		result.add("org.eclipse.passage.lic.execute"); //$NON-NLS-1$
 		result.remove("org.eclipse.passage.seal.demo"); //$NON-NLS-1$

diff --git a/...s/org.eclipse.passage.ldc.pde.ui.templates/templates/LicensedE3Product/$pluginId$.product b/...s/org.eclipse.passage.ldc.pde.ui.templates/templates/LicensedE3Product/$pluginId$.product
@@ -21,11 +21,6 @@
       <plugin id="com.fasterxml.jackson.core.jackson-core"/>
       <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
       <plugin id="com.github.oshi.oshi-core"/>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.sun.jna"/>
-      <plugin id="com.sun.jna.platform"/>
-      <plugin id="javax.annotation"/>
-      <plugin id="javax.inject"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.i18n"/>

diff --git a/...se.passage.ldc.pde.ui.templates/templates/LicensedE4FullFeatherProduct/$pluginId$.product b/...se.passage.ldc.pde.ui.templates/templates/LicensedE4FullFeatherProduct/$pluginId$.product
@@ -21,11 +21,6 @@
       <plugin id="com.fasterxml.jackson.core.jackson-core"/>
       <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
       <plugin id="com.github.oshi.oshi-core"/>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.sun.jna"/>
-      <plugin id="com.sun.jna.platform"/>
-      <plugin id="javax.annotation"/>
-      <plugin id="javax.inject"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.i18n"/>

diff --git a/...s/org.eclipse.passage.ldc.pde.ui.templates/templates/LicensedE4Product/$pluginId$.product b/...s/org.eclipse.passage.ldc.pde.ui.templates/templates/LicensedE4Product/$pluginId$.product
@@ -21,11 +21,6 @@
       <plugin id="com.fasterxml.jackson.core.jackson-core"/>
       <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
       <plugin id="com.github.oshi.oshi-core"/>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.sun.jna"/>
-      <plugin id="com.sun.jna.platform"/>
-      <plugin id="javax.annotation"/>
-      <plugin id="javax.inject"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.i18n"/>